Index: src/Deltares.DSoilModel.Forms/DSoilModelContext.cs
===================================================================
diff -u -r106 -r107
--- src/Deltares.DSoilModel.Forms/DSoilModelContext.cs	(.../DSoilModelContext.cs)	(revision 106)
+++ src/Deltares.DSoilModel.Forms/DSoilModelContext.cs	(.../DSoilModelContext.cs)	(revision 107)
@@ -43,204 +43,6 @@
             StaticReflection.GetMemberName<Soil>(s => s.BelowPhreaticLevelStochast),
         };
 
-
-        private readonly HashSet<string> dGeoStabilityProperties = new HashSet<string>
-        {
-           // "AbovePhreaticLevel",
-            "AbovePhreaticLevelStochast",
-          //  "BelowPhreaticLevel",
-            "BelowPhreaticLevelStochast",
-          //  "Cohesion",
-            "CohesionStochast",
-            //"CuBottom",
-            //"CuGradient",
-            //"CuTop",
-           // "FrictionAngle",
-            "FrictionAngleStochast",
-            //"OCR",
-            //"POP",
-            "RatioCuPc",
-            //"RatioCuPcActive",
-            //"RatioCuPcPassive",
-            //"RestSlope",
-            "ShearStrengthModel",
-            //"StressTable"
-            "StrengthIncreaseExponentStochast"
-        };
-
-        private readonly HashSet<string> dGeoStabilityCPhiModelProperties = new HashSet<string>
-        {
-            "Cohesion",
-            "FrictionAngle",
-            "ShearStrengthModel",
-            "StressTable"
-        };
-
-        private readonly HashSet<string> dGeoStabilitySuMeasuredProperties = new HashSet<string>
-        {
-            "CuBottom",
-            "CuTop",
-            "ShearStrengthModel",
-            "StressTable"
-        };
-
-        private readonly HashSet<string> dGeoStabilitySuCalculatedProperties = new HashSet<string>
-        {
-            "OCR",
-            "POP",
-            "RatioCuPc",
-            "RatioCuPcActive",
-            "RatioCuPcPassive",
-            "ShearStrengthModel",
-            "StressTable"
-        };
-
-        private readonly HashSet<string> dGeoStabilitySuGradientProperties = new HashSet<string>
-        {
-            "CuGradient",
-            "CuTop",
-            "ShearStrengthModel"
-        };
-
-        private readonly HashSet<string> shearStrengthParametersProperties = new HashSet<string>
-        {
-            "BondStressTable",
-            "Cohesion",
-            "CohesionStochast",
-            "CuActiveBottom",
-            "CuActiveBottomStochast",
-            "CuActiveTop",
-            "CuActiveTopStochast",
-            "CuBottom",
-            "CuBottomStochast",
-            "CuGradient",
-            "CuGradientStochast",
-            "CuPassiveBottom",
-            "CuPassiveBottomStochast",
-            "CuPassiveTop",
-            "CuPassiveTopStochast",
-            "CuTop",
-            "CuTopStochast",
-            "FrictionAngle",
-            "OCR",
-            "OCRStochast",
-            "POP",
-            "POPStochast",
-            "RatioCuPc",
-            "RatioCuPcActive",
-            "RatioCuPcActiveStochast",
-            "RatioCuPcPassive",
-            "RatioCuPcPassiveStochast",
-            "RatioCuPcStochast",
-            "StressTable"
-        };
-
-        private readonly HashSet<string> shearStrengthInputProperties = new HashSet<string>
-        {
-            "InputModeReliabilityAnalysisOption"
-        };
-
-        private readonly HashSet<string> shearStrengthModelProperties = new HashSet<string>
-        {
-            "DilatancyType",
-            "ShearStrengthModel",
-            "StrengthIncreaseExponent",
-            "StrengthIncreaseExponentStochast",          
-            "UsePop"
-        };
-
-        private readonly HashSet<string> unitWeightFilterProperties = new HashSet<string>
-        {
-            "AbovePhreaticLevel",
-            "AbovePhreaticLevelStochast",
-            "BelowPhreaticLevel",
-            "BelowPhreaticLevelStochast",
-            "DryUnitWeight"
-        };
-
-        private readonly HashSet<string> probabilisticProperties = new HashSet<string>
-        {
-            "ExcessPorePressure",
-            "PorePressureFactor",
-            "UseDefaultProbabilisticValues"
-        };
-
-        private readonly HashSet<string> stiffnessParametersProperties = new HashSet<string>
-        {
-            "EMod",
-            "FrictionAngleStochast"
-        };
-
-        private readonly HashSet<string> bishopProbabilisticProperties = new HashSet<string>
-        {
-            "CorrelationCPhi",
-            "Cu",
-            "CuStochast",
-            "FormReferencePn",
-            "Pn",
-            "PnStochast",
-            "RRatio",
-            "RRatioStochast"
-        };
-
-        private readonly HashSet<string> pipingProperties = new HashSet<string>
-        {
-            "AbovePhreaticLevelStochast",
-            "BelowPhreaticLevelStochast",
-            "DryUnitWeight",
-            "DiameterD70Stochast",
-            "DiameterD50Stochast",
-            "PermeabKxStochast",
-            "WhitesConstant",
-            "BeddingAngle"            
-//            "BeddingAngleStochast",
-//            "DiameterD70",
-//            "DiameterD90",
-//            "PermeabKx",                        
-//            "WhitesConstantStochast"
-        };
-
-        private readonly HashSet<string> flowSlideGlobalDetailedProperties = new HashSet<string>
-        {
-            "DiameterD15",
-            "DiameterD50",
-            "DiameterD50Stochast"
-        };
-
-        private readonly HashSet<string> flowSlideAdvancedLiquefactionProperties = new HashSet<string>
-        {
-            "Evoldm",
-            "FrictionAngle",
-            "GammaKorrel",
-            "Ks0",
-            "MaxPorosity",
-            "MinPorosity",
-            "ParM",
-            "ParR",
-            "ParS2",
-            "ParU",
-            "ParV",
-            "Porosity",
-            "RelativeDensity"
-        };
-
-        private readonly HashSet<string> flowSlideAdvancedBreachingProperties = new HashSet<string>
-        {
-            "AlphaGrd",
-            "CalculationPoints",
-            "ComputedPermeability",
-            "DiameterD15",
-            "DiameterD50",
-            "DiameterD50Stochast",
-            "Equilibrium",
-            "FlowWidth",
-            "FrictionAngle",
-            "GammaKorrel",
-            "Iterations",
-            "Porosity",
-            "Vwal"
-        };
-
         #endregion
 
         /// <summary>
@@ -451,70 +253,6 @@
                         {
                             return pipingRingtoetsProperties;
                         }
-                    case UserColumnFilters.DGeoStability:
-                        {
-                            return dGeoStabilityProperties;
-                        }
-                    case UserColumnFilters.DGeoStabilityCPhiModel:
-                        {
-                            return dGeoStabilityCPhiModelProperties;
-                        }
-                    case UserColumnFilters.DGeoStabilitySuMeasured:
-                        {
-                            return dGeoStabilitySuMeasuredProperties;
-                        }
-                    case UserColumnFilters.DGeoStabilitySuCalculated:
-                        {
-                            return dGeoStabilitySuCalculatedProperties;
-                        }
-                    case UserColumnFilters.DGeoStabilitySuGradient:
-                        {
-                            return dGeoStabilitySuGradientProperties;
-                        }
-                    case UserColumnFilters.ShearStrengthParameters:
-                        {
-                            return shearStrengthParametersProperties;
-                        }
-                    case UserColumnFilters.ShearStrengthInput:
-                        {
-                            return shearStrengthInputProperties;
-                        }
-                    case UserColumnFilters.ShearStrengthModel:
-                        {
-                            return shearStrengthModelProperties;
-                        }
-                    case UserColumnFilters.UnitWeightFilter:
-                        {
-                            return unitWeightFilterProperties;
-                        }
-                    case UserColumnFilters.Probabilistic:
-                        {
-                            return probabilisticProperties;
-                        }
-                    case UserColumnFilters.StiffnessParameters:
-                        {
-                            return stiffnessParametersProperties;
-                        }
-                    case UserColumnFilters.BishopProbabilistic:
-                        {
-                            return bishopProbabilisticProperties;
-                        }
-                    case UserColumnFilters.Piping:
-                        {
-                            return pipingProperties;
-                        }
-                    case UserColumnFilters.FlowSlideGlobalDetailed:
-                        {
-                            return flowSlideGlobalDetailedProperties;
-                        }
-                    case UserColumnFilters.FlowSlideAdvancedLiquefaction:
-                        {
-                            return flowSlideAdvancedLiquefactionProperties;
-                        }
-                    case UserColumnFilters.FlowSlideAdvancedBreaching:
-                        {
-                            return flowSlideAdvancedBreachingProperties;
-                        }
                 }
             }
 
@@ -523,14 +261,16 @@
 
         private bool? VisibleAccordingSoilUserFilter(string member)
         {
+            if (alwaysVisibleProperties.Contains(member))
+            {
+                return true;
+            }
             var filteredProperties = GetFilteredProperties(SoilUserFilter);
 
             if (filteredProperties == null)
             {
                 return null;
             }
-            filteredProperties.UnionWith(alwaysVisibleProperties);
-
             return filteredProperties.Contains(member);
         }