--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhState.java	Tue Mar 06 18:51:18 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhState.java	Wed Mar 07 17:36:04 2018 +0100
@@ -23,8 +23,11 @@
 import org.dive4elements.river.artifacts.model.FacetTypes;
 import org.dive4elements.river.artifacts.model.ReportFacet;
 import org.dive4elements.river.artifacts.sinfo.SINFOArtifact;
+import org.dive4elements.river.artifacts.sinfo.common.D50Processor;
 import org.dive4elements.river.artifacts.sinfo.common.FlowDepthProcessor;
+import org.dive4elements.river.artifacts.sinfo.common.TauProcessor;
 import org.dive4elements.river.artifacts.sinfo.common.TkhProcessor;
+import org.dive4elements.river.artifacts.sinfo.common.VelocityProcessor;
 import org.dive4elements.river.artifacts.states.DefaultState;
 
 /** State in which a waterlevel has been calculated. */
@@ -47,6 +50,12 @@
                     final String name = facet.getName();
                     if (FlowDepthProcessor.FACET_FLOW_DEPTH_FILTERED.equals(name))
                         return Boolean.FALSE;
+                    if (VelocityProcessor.FACET_TKH_VELOCITY_FILTERED.equals(name))
+                        return Boolean.FALSE;
+                    if (TauProcessor.FACET_TKH_TAU_FILTERED.equals(name))
+                        return Boolean.FALSE;
+                    if (D50Processor.FACET_TKH_D50_FILTERED.equals(name))
+                        return Boolean.FALSE;
                 }
 
                 return null;
@@ -105,8 +114,10 @@
 
             facets.add(TkhProcessor.createTkhFacet(context, hash, this.id, result, index));
 
-            // FIXME: should only be optionally visible
-            facets.add(FlowDepthProcessor.createFlowDepthTkhFacet(context, hash, this.id, result, index));
+            facets.add(FlowDepthProcessor.createFlowDepthFacet(context, hash, this.id, result, index));
+            facets.add(VelocityProcessor.createVelocityFacet(context, hash, this.id, result, index));
+            facets.add(D50Processor.createD50Facet(context, hash, this.id, result, index));
+            facets.add(TauProcessor.createTauFacet(context, hash, this.id, result, index));
         }
 
         if (!resultList.isEmpty()) {