Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs
===================================================================
diff -u -r3655 -r3783
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs	(.../MStabParameters.cs)	(revision 3655)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs	(.../MStabParameters.cs)	(revision 3783)
@@ -609,7 +609,7 @@
             this.IsOverrulePLLineCreationMethod = false;
             this.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD;
             this.Model = MStabModelType.UpliftVan;
-            this.SearchMethod = MStabSearchMethod.Grid;
+            this.SearchMethod = MStabSearchMethod.BeeSwarm;
             this.gridPosition = MStabGridPosition.Right;
             this.CalculationOptions = new MStabCalculationOptions();
             this.GeometryCreationOptions = new MStabGeometryCreationOptions();
@@ -790,7 +790,7 @@
                     FailureMechanismSystemType.StabilityInside && (Model == MStabModelType.UpliftVan || Model == MStabModelType.BishopUpliftVan))
                 {
                     return new[]
-                        {MStabSearchMethod.Grid, MStabSearchMethod.BeeSwarm};
+                        {MStabSearchMethod.BeeSwarm, MStabSearchMethod.Grid};
                 }
                 if (SlipCircleDefinition.Specification.FailureMechanismSystemType ==
                     FailureMechanismSystemType.StabilityInside && Model == MStabModelType.Spencer)
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs
===================================================================
diff -u -r3664 -r3783
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs	(.../ConfigurationManager.cs)	(revision 3664)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs	(.../ConfigurationManager.cs)	(revision 3783)
@@ -130,6 +130,13 @@
                     }
                 }
             }
+
+            if (failureMechanismSystemType == FailureMechanismSystemType.StabilityInside)
+            {
+                var item = availableList[0];
+                availableList[0] = availableList[1];
+                availableList[1] = item;
+            }
             return availableList;
         }
 
@@ -158,7 +165,7 @@
                     }
                 }
             }
-            
+
             // This is the place to enable new possible failure mechanisms and models
             this[DamProjectType.Design, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available;
             this[DamProjectType.Design, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs
===================================================================
diff -u -r3664 -r3783
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs	(.../DamFailureMechanismeCalculationSpecification.cs)	(revision 3664)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs	(.../DamFailureMechanismeCalculationSpecification.cs)	(revision 3783)
@@ -142,6 +142,10 @@
                 else
                 {
                     failureMechanismeParamatersMStab.MStabParameters.Model = (MStabModelType)value;
+                    if (failureMechanismeParamatersMStab.MStabParameters.Model != MStabModelType.Bishop)
+                    {
+                        failureMechanismeParamatersMStab.MStabParameters.SearchMethod = MStabSearchMethod.BeeSwarm;
+                    }
                 }
                 DataEventPublisher.AfterChange(this, "CalculationModel");
             }