Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r2529 -r2554
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 2529)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 2554)
@@ -1200,6 +1200,7 @@
                 {
                     foreach (var scenario in scenarios)
                     {
+                        if (scenario.RequiredSafetyFactorStabilityInnerSlope == null)
                         return new[]
                         {
                             new ValidationResult(ValidationResultType.Error,
@@ -2206,7 +2207,6 @@
 
         public bool IsVisible(string property)
         {
-            var arePlLineCreationExpertKnowledgeParametersNeeded = ArePlLineCreationExpertKnowledgeParametersNeeded();
             var isDesign = IsDesign();
             
             // TODO: These string literals below should be replaced with the constants defined in LocationParameterNames
@@ -2274,7 +2274,7 @@
                     return true;
 
                 case "DistanceToEntryPoint":
-                    return false;
+                    return isDesign;
                 case "HasSensorData":
                     return false;
                 case "XRdDikeLine":
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
===================================================================
diff -u -r2513 -r2554
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 2513)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 2554)
@@ -2088,6 +2088,8 @@
                 {
                     point = redesignedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver);
                 }
+                if (point != null && scenario != null)
+                    return point.X - scenario.Location.DistanceToEntryPoint;
                 if (point != null)
                     return point.X;
                 return null;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamGlobalConstants.cs
===================================================================
diff -u -r2089 -r2554
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamGlobalConstants.cs	(.../DamGlobalConstants.cs)	(revision 2089)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamGlobalConstants.cs	(.../DamGlobalConstants.cs)	(revision 2554)
@@ -24,7 +24,6 @@
     public static class DamGlobalConstants
     {
         public const double NoRunValue = 99;
-        public const double RequiredSafetyPipingForAssessment = 1.2;
         public const double PlLineOffsetFactorBelowShoulderCrestMinValue = 0.0;
         public const double PlLineOffsetFactorBelowShoulderCrestMaxValue = 1.0;
     }