Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r6980 -r6981
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 6980)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 6981)
@@ -1622,16 +1622,13 @@
     [Validate]
     public ValidationResult[] ValidateLocationNewDikeTopWidth()
     {
-        if (DamProjectType == DamProjectType.Design)
+        if (DamProjectType == DamProjectType.Design && UseNewDikeTopWidth && (NewDikeTopWidth < newDikeTopWidthMinValue))
         {
-            if (UseNewDikeTopWidth && (NewDikeTopWidth < newDikeTopWidthMinValue))
+            return new[]
             {
-                return new[]
-                {
-                    new ValidationResult(ValidationResultType.Error,
-                                         String.Format(LocalizationManager.GetTranslatedText(this, "NewDikeTopWidthRangeError"), newDikeTopWidthMinValue), this, "NewDikeTopWidth", "AssignMinValue", this)
-                };
-            }
+                new ValidationResult(ValidationResultType.Error,
+                                     String.Format(LocalizationManager.GetTranslatedText(this, "NewDikeTopWidthRangeError"), newDikeTopWidthMinValue), this, "NewDikeTopWidth", "AssignMinValue", this)
+            };
         }
 
         return new ValidationResult[0];
@@ -1640,16 +1637,13 @@
     [Validate]
     public ValidationResult[] ValidateLocationNewDikeSlopeInside()
     {
-        if (DamProjectType == DamProjectType.Design)
+        if (DamProjectType == DamProjectType.Design && UseNewDikeSlopeInside && (NewDikeSlopeInside < newDikeSlopeInsideMinValue))
         {
-            if (UseNewDikeSlopeInside && (NewDikeSlopeInside < newDikeSlopeInsideMinValue))
+            return new[]
             {
-                return new[]
-                {
-                    new ValidationResult(ValidationResultType.Error,
-                                         String.Format(LocalizationManager.GetTranslatedText(this, "NewDikeSlopeInsideRangeError"), newDikeSlopeInsideMinValue), this, "NewDikeSlopeInside", "AssignMinValue", this)
-                };
-            }
+                new ValidationResult(ValidationResultType.Error,
+                                     String.Format(LocalizationManager.GetTranslatedText(this, "NewDikeSlopeInsideRangeError"), newDikeSlopeInsideMinValue), this, "NewDikeSlopeInside", "AssignMinValue", this)
+            };
         }
 
         return new ValidationResult[0];
@@ -1658,16 +1652,13 @@
     [Validate]
     public ValidationResult[] ValidateLocationNewDikeSlopeOutside()
     {
-        if (DamProjectType == DamProjectType.Design)
+        if (DamProjectType == DamProjectType.Design && UseNewDikeSlopeOutside && (NewDikeSlopeOutside < newDikeSlopeOutsideMinValue))
         {
-            if (UseNewDikeSlopeOutside && (NewDikeSlopeOutside < newDikeSlopeOutsideMinValue))
+            return new[]
             {
-                return new[]
-                {
-                    new ValidationResult(ValidationResultType.Error,
-                                         String.Format(LocalizationManager.GetTranslatedText(this, "NewDikeSlopeOutsideRangeError"), newDikeSlopeOutsideMinValue), this, "NewDikeSlopeOutside", "AssignMinValue", this)
-                };
-            }
+                new ValidationResult(ValidationResultType.Error,
+                                     String.Format(LocalizationManager.GetTranslatedText(this, "NewDikeSlopeOutsideRangeError"), newDikeSlopeOutsideMinValue), this, "NewDikeSlopeOutside", "AssignMinValue", this)
+            };
         }
 
         return new ValidationResult[0];
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/StabilityParameters.cs
===================================================================
diff -u -r6980 -r6981
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/StabilityParameters.cs	(.../StabilityParameters.cs)	(revision 6980)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/StabilityParameters.cs	(.../StabilityParameters.cs)	(revision 6981)
@@ -32,6 +32,9 @@
 /// </summary>
 public class StabilityParameters : IDomain, IVisibleEnabled, ICloneable<StabilityParameters>
 {
+    private const string searchMethod = "SearchMethod";
+    private const string isUpliftVanRunOnlyWhenUpliftOccurs = "IsUpliftVanRunOnlyWhenUpliftOccurs";
+    
     public StabilityParameters()
     {
         SearchMethod = StabilitySearchMethod.BeeSwarm;
@@ -50,7 +53,7 @@
     /// When true, the uplift van calculation is only run when an uplift occurs.
     /// </summary>
     [Validate]
-    public bool IsUpliftVanRunOnlyWhenUpliftOccurs { get; set; } = true;
+    public bool IsUpliftVanRunOnlyWhenUpliftOccurs { get; set; }
 
     /// <summary>
     /// The slip circle definition.
@@ -64,10 +67,6 @@
     /// <param name="failureMechanismCalculation"></param>
     public void Assign(StabilityParameters failureMechanismCalculation)
     {
-        // failureMechanismSystemType = damFailureMechanismCalculation.FailureMechanismSystemType;
-        // calculationModel = damFailureMechanismCalculation.CalculationModel;
-        // pipingModelType = damFailureMechanismCalculation.PipingModelType;
-        // stabilityModelType = damFailureMechanismCalculation.StabilityModelType;
         SearchMethod = failureMechanismCalculation.SearchMethod;
         IsUpliftVanRunOnlyWhenUpliftOccurs = failureMechanismCalculation.IsUpliftVanRunOnlyWhenUpliftOccurs;
         if (SlipCircleDefinition != null)
@@ -78,7 +77,6 @@
         {
             SlipCircleDefinition = null;
         }
-        //assign interface
     }
 
     public StabilityParameters Clone()
@@ -99,7 +97,7 @@
     {
         switch (property)
         {
-            case "SearchMethod":
+            case searchMethod:
                 if (SlipCircleDefinition.Specification.FailureMechanismSystemType ==
                     FailureMechanismSystemType.StabilityInside &&
                     (SlipCircleDefinition.Specification.StabilityModelType == StabilityModelType.UpliftVan ||
@@ -115,9 +113,9 @@
                 // Make sure that grid is reset and updated too when needed.
                 if (SearchMethod != StabilitySearchMethod.Grid)
                 {
-                    DataEventPublisher.BeforeChange(this, "SearchMethod");
+                    DataEventPublisher.BeforeChange(this, searchMethod);
                     SearchMethod = StabilitySearchMethod.Grid;
-                    DataEventPublisher.AfterChange(this, "SearchMethod");
+                    DataEventPublisher.AfterChange(this, searchMethod);
                 }
 
                 return new[]
@@ -132,8 +130,8 @@
     {
         switch (property)
         {
-            case "SearchMethod":
-            case "IsUpliftVanRunOnlyWhenUpliftOccurs":
+            case searchMethod:
+            case isUpliftVanRunOnlyWhenUpliftOccurs:
                 return Location.DamProjectType == DamProjectType.Design;
             default: return true;
         }
@@ -143,8 +141,8 @@
     {
         switch (property)
         {
-            case "SearchMethod":
-            case "IsUpliftVanRunOnlyWhenUpliftOccurs":
+            case searchMethod:
+            case isUpliftVanRunOnlyWhenUpliftOccurs:
                 return
                     (SlipCircleDefinition.Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside ||
                      SlipCircleDefinition.Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) &&