diff --git a/AsbCloudInfrastructure/Services/WellInfoService.cs b/AsbCloudInfrastructure/Services/WellInfoService.cs
index 5d5f3bf3..9c407490 100644
--- a/AsbCloudInfrastructure/Services/WellInfoService.cs
+++ b/AsbCloudInfrastructure/Services/WellInfoService.cs
@@ -43,7 +43,10 @@ public class WellInfoService
 
             var wellsIds = activeWells.Select(w => w.Id);
 
-            var processMapPlanWellDrillingRequests = wellsIds.Select(id => new ProcessMapPlanBaseRequestWithWell(id));
+            var processMapPlanWellDrillingRequests = wellsIds.Select(id => new ProcessMapPlanBaseRequestWithWell(id)
+            {
+                Moment = DateTimeOffset.UtcNow.AddDays(1)
+            });
             var processMapPlanWellDrillings = new List<ProcessMapPlanDrillingDto>();
             foreach (var processMapPlanWellDrillingRequest in processMapPlanWellDrillingRequests)
             {
@@ -97,14 +100,21 @@ public class WellInfoService
                 int? idSection = wellLastFactSection?.Id;
                 ProcessMapPlanDrillingDto? processMapPlanWellDrilling = null;
 
-                if (idSection.HasValue)
+                if(idSection.HasValue && currentDepth.HasValue)
                 {
-                    processMapPlanWellDrilling = wellProcessMaps.FirstOrDefault(p => p.IdWellSectionType == idSection);
-                }
-                else if (currentDepth.HasValue)
+                    processMapPlanWellDrilling = wellProcessMaps
+                        .Where(p => p.IdWellSectionType == idSection)
+                        .Where(p => p.DepthStart <= currentDepth.Value && p.DepthEnd >= currentDepth.Value)
+                        .FirstOrDefault();
+                }               
+                else if(currentDepth.HasValue)
                 {
                     processMapPlanWellDrilling = wellProcessMaps.FirstOrDefault(p => p.DepthStart <= currentDepth.Value && p.DepthEnd >= currentDepth.Value);
                 }
+                else if (idSection.HasValue)
+                {
+                    processMapPlanWellDrilling = wellProcessMaps.FirstOrDefault(p => p.IdWellSectionType == idSection);
+                }
 
                 double? planTotalDepth = null;
                 planTotalDepth = wellDepthByProcessMap.FirstOrDefault(p => p.Id == well.Id)?.DepthEnd;