Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs
===================================================================
diff -u -r454 -r458
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 454)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 458)
@@ -93,28 +93,48 @@
         [Test]
         public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterAll()
         {
-            var dSoilModelContext = SetupDSoilModelContext(null); // Filter "All"
-            var testSoil = new Soil();
-
-            var type = testSoil.GetType();
-            var properties = type.GetProperties(BindingFlags.Instance | BindingFlags.Public);
-            foreach (var property in properties)
+            var visibleProperties = new List<string>
             {
-                var propertyName = property.Name;
-                var isVisible = dSoilModelContext.IsVisible(testSoil, propertyName);
-                if (excludedProperties.Contains(property.Name))
-                {
-                    Assert.IsTrue(isVisible == false, "Soil property " + propertyName + " should not be visible.");
-                }
-                else
-                {
-                    Assert.IsTrue(isVisible != false, "Soil property " + propertyName + " should be visible.");
-                }
-            }
+                StaticReflection.GetMemberName<Soil>(s => s.AbovePhreaticLevel),
+                StaticReflection.GetMemberName<Soil>(s => s.AbovePhreaticLevelStochast),
+                StaticReflection.GetMemberName<Soil>(s => s.BelowPhreaticLevel),
+                StaticReflection.GetMemberName<Soil>(s => s.BelowPhreaticLevelStochast),
+                StaticReflection.GetMemberName<Soil>(s => s.Cohesion),
+                StaticReflection.GetMemberName<Soil>(s => s.CohesionStochast),
+                StaticReflection.GetMemberName<Soil>(s => s.FrictionAngle),
+                StaticReflection.GetMemberName<Soil>(s => s.FrictionAngleStochast),
+                StaticReflection.GetMemberName<Soil>(s => s.RatioCuPc),
+                StaticReflection.GetMemberName<Soil>(s => s.RatioCuPcStochast),
+                StaticReflection.GetMemberName<Soil>(s => s.StrengthIncreaseExponent),
+                StaticReflection.GetMemberName<Soil>(s => s.StrengthIncreaseExponentStochast),
+                StaticReflection.GetMemberName<Soil>(s => s.POP),
+                StaticReflection.GetMemberName<Soil>(s => s.POPStochast),
+                StaticReflection.GetMemberName<Soil>(s => s.ShearStrengthModel),
+                StaticReflection.GetMemberName<Soil>(s => s.UsePop),
+                StaticReflection.GetMemberName<Soil>(s => s.DiameterD70),
+                StaticReflection.GetMemberName<Soil>(s => s.DiameterD70Stochast),
+                StaticReflection.GetMemberName<Soil>(s => s.PermeabKx),
+                StaticReflection.GetMemberName<Soil>(s => s.PermeabKxStochast),
+                StaticReflection.GetMemberName<Soil>(s => s.DiameterD15),
+                StaticReflection.GetMemberName<Soil>(s => s.DiameterD50),
+                StaticReflection.GetMemberName<Soil>(s => s.Porosity),
+                StaticReflection.GetMemberName<Soil>(s => s.MinPorosity),
+                StaticReflection.GetMemberName<Soil>(s => s.MaxPorosity),
+                StaticReflection.GetMemberName<Soil>(s => s.Evoldm),
+                StaticReflection.GetMemberName<Soil>(s => s.Ks0),
+                StaticReflection.GetMemberName<Soil>(s => s.GammaKorrel),
+                StaticReflection.GetMemberName<Soil>(s => s.ParM),
+                StaticReflection.GetMemberName<Soil>(s => s.ParU),
+                StaticReflection.GetMemberName<Soil>(s => s.ParV),
+                StaticReflection.GetMemberName<Soil>(s => s.ParR),
+            };
+            visibleProperties.AddRange(alwaysVisibleProperties);
+
+            AdhereToFilter(null, visibleProperties);
         }
 
         [Test]
-        public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterMacrostabilityBasicModule()
+        public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterMacrostabilityWti()
         {
             var visibleProperties = new List<string>
             {
@@ -252,7 +272,7 @@
             }
         }
 
-        private static void AdhereToFilter(UserColumnFilters filter, ICollection<string> visibleProperties)
+        private static void AdhereToFilter(UserColumnFilters? filter, ICollection<string> visibleProperties)
         {
             var dSoilModelContext = SetupDSoilModelContext(filter);
             var testSoil = new Soil();
Index: src/Deltares.DSoilModel.Forms/DSoilModelContext.cs
===================================================================
diff -u -r454 -r458
--- src/Deltares.DSoilModel.Forms/DSoilModelContext.cs	(.../DSoilModelContext.cs)	(revision 454)
+++ src/Deltares.DSoilModel.Forms/DSoilModelContext.cs	(.../DSoilModelContext.cs)	(revision 458)
@@ -6,7 +6,6 @@
 using Deltares.Standard.Attributes;
 using Deltares.Standard.Forms.DExpress;
 using Deltares.Standard.Reflection;
-using Deltares.Standard.Reflection.Enumerator;
 
 namespace Deltares.DSoilModel.Forms
 {
@@ -71,8 +70,18 @@
             StaticReflection.GetMemberName<Soil>(s => s.ParR),
         };
 
+        private readonly HashSet<string> combinedSoilProperties = null;
+
         #endregion
 
+        public DSoilModelContext()
+        {
+            combinedSoilProperties = new HashSet<string>();
+            combinedSoilProperties.UnionWith(macrostabilitySoilProperties);
+            combinedSoilProperties.UnionWith(pipingSoilProperties);
+            combinedSoilProperties.UnionWith(flowslideSoilProperties);
+        }
+
         /// <summary>
         /// The current filter to display all parameters, stochastic parameters only or as-is parameters only.
         /// </summary>
@@ -369,21 +378,20 @@
                 switch ((UserColumnFilters)soilUserFilter)
                 {
                     case UserColumnFilters.MacrostabilityWti:
-                        {
+                    {
                             return macrostabilitySoilProperties;
-                        }
+                    }
                     case UserColumnFilters.PipingWti:
-                        {
+                    {
                             return pipingSoilProperties;
-                        }
+                    }
                     case UserColumnFilters.FlowSlideWti:
-                        {
+                    {
                             return flowslideSoilProperties;
-                        }
+                    }
                 }
             }
-
-            return base.GetFilteredProperties(soilUserFilter);
+            return combinedSoilProperties;
         }
 
         private bool? VisibleAccordingSoilUserFilter(string member)