Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs
===================================================================
diff -u -r4539 -r5532
--- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs	(.../DamProjectCalculationOptionsPropertyControl.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs	(.../DamProjectCalculationOptionsPropertyControl.cs)	(revision 5532)
@@ -62,11 +62,20 @@
             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 -r5531 -r5532
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs	(.../MStabParameters.cs)	(revision 5531)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs	(.../MStabParameters.cs)	(revision 5532)
@@ -416,42 +416,30 @@
 
         switch (property)
         {
-            case "GridSizeDetermination": return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan() || IsStabiltyBishop();
+            case "GridSizeDetermination": return  IsStabilityBishop() || IsStabilityBishopUpliftVan() || IsStabilityUpliftVan();
+            
             // 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 IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
+                return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan();
 
             // Bishop
             case "BishopTangentLinesDefinition":
-                return false; //IsStabiltyBishop() || IsStabiltyBishopUpliftVan(); False for now. See MWDAM-640. 
             case "BishopTangentLinesDistance":
-                return false; //IsStabiltyBishop() || IsStabiltyBishopUpliftVan(); False for now. See MWDAM-640. 
+                return false; //IsStabilityBishop() || IsStabilityBishopUpliftVan(); False for now. See MWDAM-640. 
             case "BishopGridVerticalPointCount":
-                return IsStabiltyBishop() || IsStabiltyBishopUpliftVan();
             case "BishopGridVerticalPointDistance":
-                return IsStabiltyBishop() || IsStabiltyBishopUpliftVan();
             case "BishopGridHorizontalPointCount":
-                return IsStabiltyBishop() || IsStabiltyBishopUpliftVan();
             case "BishopGridHorizontalPointDistance":
-                return IsStabiltyBishop() || IsStabiltyBishopUpliftVan();
+                return IsStabilityBishop() || IsStabilityBishopUpliftVan();
             default: return true;
         }
     }
@@ -465,63 +453,60 @@
 
         switch (property)
         {
+            case "GridSizeDetermination": return  IsStabilityBishop() || IsStabilityBishopUpliftVan() || (IsStabilityUpliftVan() && !IsBeeSwarm());
+
             // Uplift Van
-            case "UpliftVanTangentLinesDefinition":
-                return true;
+            case "UpliftVanTangentLinesDefinition": return  !IsBeeSwarm();
             case "UpliftVanTangentLinesDistance":
-                return UpliftVanTangentLinesDefinition == TangentLinesDefinition.Specified;
+                return UpliftVanTangentLinesDefinition == TangentLinesDefinition.Specified && !IsBeeSwarm();
             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;
+                return GridSizeDetermination == GridSizeDetermination.Specified && !IsBeeSwarm();
 
             // 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 IsStabiltyBishop()
+    private bool IsStabilityBishop()
     {
-        return ((Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside ||
-                 Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) &&
+        return (Specification.FailureMechanismSystemType is FailureMechanismSystemType.StabilityInside 
+                    or FailureMechanismSystemType.StabilityOutside && 
                 (MStabModelType) Specification.CalculationModel == MStabModelType.Bishop);
     }
 
-    private bool IsStabiltyUpliftVan()
+    private bool IsStabilityUpliftVan()
     {
-        return ((Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside ||
-                 Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) &&
-                (MStabModelType) Specification.CalculationModel == MStabModelType.UpliftVan);
+        return Specification.FailureMechanismSystemType is FailureMechanismSystemType.StabilityInside 
+                    or FailureMechanismSystemType.StabilityOutside &&
+                (MStabModelType) Specification.CalculationModel == MStabModelType.UpliftVan;
     }
 
-    private bool IsStabiltyBishopUpliftVan()
+    private bool IsBeeSwarm()
     {
-        return ((Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside ||
-                 Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) &&
+        return (IsStabilityUpliftVan() || IsStabilityBishopUpliftVan()) && 
+               (Specification.FailureMechanismeParamatersMStab.MStabParameters.SearchMethod == MStabSearchMethod.BeeSwarm); 
+    }
+
+    private bool IsStabilityBishopUpliftVan()
+    {
+        return (Specification.FailureMechanismSystemType is FailureMechanismSystemType.StabilityInside 
+                    or FailureMechanismSystemType.StabilityOutside &&
                 (MStabModelType) Specification.CalculationModel == MStabModelType.BishopUpliftVan);
     }
 }