Index: src/Deltares.DSoilModel.Tests/DSoilModelContextTest.cs
===================================================================
diff -u -r132 -r139
--- src/Deltares.DSoilModel.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 132)
+++ src/Deltares.DSoilModel.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 139)
@@ -132,6 +132,37 @@
         }
 
         [Test]
+        public void DSoilModelContext_SoilMemberIsEnabled_AdhereToFilterMacrostabilityBasicModule()
+        {
+            var context = SetupDSoilModelContext(UserColumnFilters.MacrostabilityBasicModule);
+            var soil = new Soil
+            {
+                ShearStrengthModel = ShearStrengthModel.CPhi,
+                UseDefaultShearStrengthModel = false, // or it will mess up this test !
+
+            };
+            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.Cohesion)));
+            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.FrictionAngle)));
+            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.UsePop)));
+            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.POP)));
+            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc)));
+            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.StrengthIncreaseExponent)));
+            
+            soil.ShearStrengthModel = ShearStrengthModel.CuCalculated;
+            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.Cohesion)));
+            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.FrictionAngle)));
+            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.UsePop)));
+            soil.UsePop = true;
+            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.POP)));
+            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc)));
+            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.StrengthIncreaseExponent)));
+            soil.UsePop = false;
+            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.POP)));
+            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc)));
+            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.StrengthIncreaseExponent)));
+        }
+
+        [Test]
         public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterPipingRingToets()
         {
             var visibleProperties = new List<string>
Index: src/Deltares.DSoilModel.Forms/DSoilModelContext.cs
===================================================================
diff -u -r132 -r139
--- src/Deltares.DSoilModel.Forms/DSoilModelContext.cs	(.../DSoilModelContext.cs)	(revision 132)
+++ src/Deltares.DSoilModel.Forms/DSoilModelContext.cs	(.../DSoilModelContext.cs)	(revision 139)
@@ -26,13 +26,13 @@
         {
             StaticReflection.GetMemberName<Soil>(s => s.AbovePhreaticLevel),
             StaticReflection.GetMemberName<Soil>(s => s.BelowPhreaticLevel),
+            StaticReflection.GetMemberName<Soil>(s => s.ShearStrengthModel),
             StaticReflection.GetMemberName<Soil>(s => s.Cohesion),
             StaticReflection.GetMemberName<Soil>(s => s.FrictionAngle),
+            StaticReflection.GetMemberName<Soil>(s => s.UsePop),
+            StaticReflection.GetMemberName<Soil>(s => s.POP),
             StaticReflection.GetMemberName<Soil>(s => s.RatioCuPc),
             StaticReflection.GetMemberName<Soil>(s => s.StrengthIncreaseExponent),
-            StaticReflection.GetMemberName<Soil>(s => s.POP),
-            StaticReflection.GetMemberName<Soil>(s => s.ShearStrengthModel),
-            StaticReflection.GetMemberName<Soil>(s => s.UsePop)
         };
 
         private readonly HashSet<string> pipingRingtoetsProperties = new HashSet<string>
@@ -50,6 +50,14 @@
         /// </summary>
         public ParameterViewSettings ParameterView { get; set; }
 
+        /// <summary>
+        /// Method indicating a visibility override value for a given instance object.
+        /// </summary>
+        /// <param name="source">Object being evaluated.</param>
+        /// <param name="member">Name of the member which is part of <paramref name="source" />.</param>
+        /// <returns>
+        /// True if visible; False if hidden; Null if no override.
+        /// </returns>
         public override bool? IsVisible(object source, string member)
         {
             if (source is BaseControlBinding || source is GridViewControl)
@@ -193,6 +201,14 @@
             return base.IsVisible(source, member);
         }
 
+        /// <summary>
+        /// Method indicating if the enabled override value for a given instance object.
+        /// </summary>
+        /// <param name="source">Object being evaluated.</param>
+        /// <param name="member">Name of the member which is part of <paramref name="source" />.</param>
+        /// <returns>
+        /// True if enabled; False if disabled; Null if no override.
+        /// </returns>
         public override bool? IsEnabled(object source, string member)
         {
             if (source is ConePenetrationTestData)
@@ -215,7 +231,8 @@
                 return false;
             }
 
-            if (source is Soil)
+            var soil = source as Soil;
+            if (soil != null)
             {
                 BindPropertyInfo propertyInfo = PropertyInfoSupport.GetPropertyInfo(typeof(Soil), member);
                 if (propertyInfo != null)
@@ -228,17 +245,61 @@
 
                 if (member.EndsWith("Stochast"))
                 {
-                    return ParameterView != ParameterViewSettings.AsIsParameters;
+                    if (ParameterView == ParameterViewSettings.AsIsParameters)
+                    {
+                        return false;
+                    }
                 }
                 if (!alwaysVisibleProperties.Contains(member))
                 {
-                    return ParameterView != ParameterViewSettings.ProbabilisticParameters;
+                    if (ParameterView == ParameterViewSettings.ProbabilisticParameters)
+                    {
+                        return false;
+                    }
                 }
+                if (member == soil.GetMemberName(s => s.Cohesion) ||
+                    member == soil.GetMemberName(s => s.FrictionAngle))
+                {
+                    return soil.ShearStrengthModel == ShearStrengthModel.CPhi;
+                }
+                if (member == soil.GetMemberName(s => s.UsePop))
+                {
+                    return (soil.ShearStrengthModel == ShearStrengthModel.CuCalculated);
+                }
+                if (member == soil.GetMemberName(s => s.POP) ||
+                    member == soil.GetMemberName(s => s.RatioCuPc) ||
+                    member == soil.GetMemberName(s => s.StrengthIncreaseExponent))
+                {
+                    if (soil.ShearStrengthModel != ShearStrengthModel.CuCalculated)
+                    {
+                        return false;
+                    }
+                }
             }
 
             return base.IsEnabled(source, member);
         }
 
+        /// <summary>
+        /// Method returning a collection of domain object for list or enum type members;
+        /// </summary>
+        /// <param name="source">Object being evaluated.</param>
+        /// <param name="member">Name of the member which is part of <paramref name="source"/>.</param>
+        /// <returns>A collection of domain object; Null if no override.</returns>
+        public override ICollection GetDomain(object source, string member)
+        {
+            // not yet implemented here (yet)
+            if (source is Soil && member == StaticReflection.GetMemberName<Soil>(s => s.ShearStrengthModel))
+            {
+                return new List<ShearStrengthModel>
+                {
+                    ShearStrengthModel.CPhi,
+                    ShearStrengthModel.CuCalculated
+                };
+            }
+            return null;
+        }
+
         protected override HashSet<string> GetFilteredProperties(object soilUserFilter)
         {
             if (soilUserFilter is UserColumnFilters)