Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs
===================================================================
diff -u -r5570 -r5571
--- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs	(.../DamProjectCalculationOptionsPropertyControl.cs)	(revision 5570)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs	(.../DamProjectCalculationOptionsPropertyControl.cs)	(revision 5571)
@@ -62,20 +62,11 @@
             StabilityGroupControl.Text = "StabilityOptionsGroupControl";
             LocalizationSupport.RegisterAndTranslate(typeof(DamProjectCalculationOptionsPropertyControl), StabilityGroupControl);
             DataEventPublisher.OnAfterChange += DataEventPublisher_OnAfterChange;
-            SearchMethodCombobox.SelectedIndexChanged += SearchMethodCombobox_SelectedIndexChanged;
 
             FormsSupport.RepairRightAnchoredControls(this);
             FormsSupport.AdjustSizeToContents(SearchMethodPanelControl);
             FormsSupport.AdjustSizeToContents(CircleDefinitionPanelControl);
         }
-        
-        private void SearchMethodCombobox_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (currentSpecification != null)
-            {
-                SetSelectedDamCalculationSpecification();
-            }
-        }
 
         public object SelectedObject
         {
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs
===================================================================
diff -u -r5532 -r5571
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs	(.../MStabParameters.cs)	(revision 5532)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs	(.../MStabParameters.cs)	(revision 5571)
@@ -416,30 +416,42 @@
 
         switch (property)
         {
-            case "GridSizeDetermination": return  IsStabilityBishop() || IsStabilityBishopUpliftVan() || IsStabilityUpliftVan();
-            
+            case "GridSizeDetermination": return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan() || IsStabiltyBishop();
             // Uplift Van
             case "UpliftVanTangentLinesDefinition":
+                return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
             case "UpliftVanTangentLinesDistance":
+                return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
             case "UpliftVanLeftGridVerticalPointCount":
+                return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
             case "UpliftVanLeftGridVerticalPointDistance":
+                return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
             case "UpliftVanLeftGridHorizontalPointCount":
+                return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
             case "UpliftVanLeftGridHorizontalPointDistance":
+                return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
             case "UpliftVanRightGridVerticalPointCount":
+                return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
             case "UpliftVanRightGridVerticalPointDistance":
+                return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
             case "UpliftVanRightGridHorizontalPointCount":
+                return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
             case "UpliftVanRightGridHorizontalPointDistance":
-                return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan();
+                return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
 
             // Bishop
             case "BishopTangentLinesDefinition":
+                return false; //IsStabiltyBishop() || IsStabiltyBishopUpliftVan(); False for now. See MWDAM-640. 
             case "BishopTangentLinesDistance":
-                return false; //IsStabilityBishop() || IsStabilityBishopUpliftVan(); False for now. See MWDAM-640. 
+                return false; //IsStabiltyBishop() || IsStabiltyBishopUpliftVan(); False for now. See MWDAM-640. 
             case "BishopGridVerticalPointCount":
+                return IsStabiltyBishop() || IsStabiltyBishopUpliftVan();
             case "BishopGridVerticalPointDistance":
+                return IsStabiltyBishop() || IsStabiltyBishopUpliftVan();
             case "BishopGridHorizontalPointCount":
+                return IsStabiltyBishop() || IsStabiltyBishopUpliftVan();
             case "BishopGridHorizontalPointDistance":
-                return IsStabilityBishop() || IsStabilityBishopUpliftVan();
+                return IsStabiltyBishop() || IsStabiltyBishopUpliftVan();
             default: return true;
         }
     }
@@ -453,60 +465,63 @@
 
         switch (property)
         {
-            case "GridSizeDetermination": return  IsStabilityBishop() || IsStabilityBishopUpliftVan() || (IsStabilityUpliftVan() && !IsBeeSwarm());
-
             // Uplift Van
-            case "UpliftVanTangentLinesDefinition": return  !IsBeeSwarm();
+            case "UpliftVanTangentLinesDefinition":
+                return true;
             case "UpliftVanTangentLinesDistance":
-                return UpliftVanTangentLinesDefinition == TangentLinesDefinition.Specified && !IsBeeSwarm();
+                return UpliftVanTangentLinesDefinition == TangentLinesDefinition.Specified;
             case "UpliftVanLeftGridVerticalPointCount":
+                return GridSizeDetermination == GridSizeDetermination.Specified;
             case "UpliftVanLeftGridVerticalPointDistance":
+                return GridSizeDetermination == GridSizeDetermination.Specified;
             case "UpliftVanLeftGridHorizontalPointCount":
+                return GridSizeDetermination == GridSizeDetermination.Specified;
             case "UpliftVanLeftGridHorizontalPointDistance":
+                return GridSizeDetermination == GridSizeDetermination.Specified;
             case "UpliftVanRightGridVerticalPointCount":
+                return GridSizeDetermination == GridSizeDetermination.Specified;
             case "UpliftVanRightGridVerticalPointDistance":
+                return GridSizeDetermination == GridSizeDetermination.Specified;
             case "UpliftVanRightGridHorizontalPointCount":
+                return GridSizeDetermination == GridSizeDetermination.Specified;
             case "UpliftVanRightGridHorizontalPointDistance":
-                return GridSizeDetermination == GridSizeDetermination.Specified && !IsBeeSwarm();
+                return GridSizeDetermination == GridSizeDetermination.Specified;
 
             // Bishop
             case "BishopTangentLinesDefinition":
                 return true;
             case "BishopTangentLinesDistance":
                 return BishopTangentLinesDefinition == TangentLinesDefinition.Specified;
             case "BishopGridVerticalPointCount":
+                return GridSizeDetermination == GridSizeDetermination.Specified;
             case "BishopGridVerticalPointDistance":
+                return GridSizeDetermination == GridSizeDetermination.Specified;
             case "BishopGridHorizontalPointCount":
+                return GridSizeDetermination == GridSizeDetermination.Specified;
             case "BishopGridHorizontalPointDistance":
                 return GridSizeDetermination == GridSizeDetermination.Specified;
             default: return true;
         }
     }
 
-    private bool IsStabilityBishop()
+    private bool IsStabiltyBishop()
     {
-        return (Specification.FailureMechanismSystemType is FailureMechanismSystemType.StabilityInside 
-                    or FailureMechanismSystemType.StabilityOutside && 
+        return ((Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside ||
+                 Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) &&
                 (MStabModelType) Specification.CalculationModel == MStabModelType.Bishop);
     }
 
-    private bool IsStabilityUpliftVan()
+    private bool IsStabiltyUpliftVan()
     {
-        return Specification.FailureMechanismSystemType is FailureMechanismSystemType.StabilityInside 
-                    or FailureMechanismSystemType.StabilityOutside &&
-                (MStabModelType) Specification.CalculationModel == MStabModelType.UpliftVan;
+        return ((Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside ||
+                 Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) &&
+                (MStabModelType) Specification.CalculationModel == MStabModelType.UpliftVan);
     }
 
-    private bool IsBeeSwarm()
+    private bool IsStabiltyBishopUpliftVan()
     {
-        return (IsStabilityUpliftVan() || IsStabilityBishopUpliftVan()) && 
-               (Specification.FailureMechanismeParamatersMStab.MStabParameters.SearchMethod == MStabSearchMethod.BeeSwarm); 
-    }
-
-    private bool IsStabilityBishopUpliftVan()
-    {
-        return (Specification.FailureMechanismSystemType is FailureMechanismSystemType.StabilityInside 
-                    or FailureMechanismSystemType.StabilityOutside &&
+        return ((Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside ||
+                 Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) &&
                 (MStabModelType) Specification.CalculationModel == MStabModelType.BishopUpliftVan);
     }
 }