--- a/artifacts/doc/conf/artifacts/sinfo.xml	Wed Jun 06 17:43:34 2018 +0200
+++ b/artifacts/doc/conf/artifacts/sinfo.xml	Thu Jun 07 17:44:41 2018 +0200
@@ -69,6 +69,8 @@
             <facet name="sinfo_facet_tkh" description="Facet for tkh" />
 
             <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations" />
+
+            <facet name="sinfo_flow_depth.manualpoints" description="Manual Points" />
           </facets>
         </outputmode>
 
@@ -120,6 +122,8 @@
             <facet name="sinfo_facet_flow_depth_max" description="max flow depth" />
 
             <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations" />
+            
+            <facet name="sinfo_flow_depth_minmax.manualpoints" description="Manual Points" />            
           </facets>
         </outputmode>
 
@@ -187,6 +191,8 @@
             <facet name="sinfo_facet_flow_depth_historical" description="flow depth historical" />
 
             <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations" />
+            
+            <facet name="sinfo_flow_depth_development.manualpoints" description="Manual Points" />            
           </facets>
         </outputmode>
 
@@ -196,6 +202,8 @@
             <facet name="sinfo_facet_flow_depth_development_per_year" description="flow depth development per year" />
 
             <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations" />
+            
+            <facet name="sinfo_flow_depth_development_peryear.manualpoints" description="Manual Points" />            
           </facets>
         </outputmode>
 
@@ -214,9 +222,6 @@
       </outputmodes>
     </state>
 
-
-
-
     <!-- Calculation Mode: Grundberührungen -->
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
@@ -248,8 +253,6 @@
       <condition data="ye_select" value="state.sinfo.epoch" operator="equal" />
     </transition>
 
-
-
     <state id="state.sinfo.load.year" description="state.sinfo.load.year" state="org.dive4elements.river.artifacts.sinfo.collision.LoadMultipleYearSelectState" helpText="help.state.sinfo.load.year">
       <data name="years" type="String" /> 
     </state>
@@ -258,7 +261,6 @@
       <data name="epochs" type="String" />
     </state>
 
-
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.sinfo.load.year" />
       <to state="state.sinfo.collision" />
@@ -271,13 +273,11 @@
       <condition data="calculation_mode" value="sinfo_calc_collision" operator="equal" />
     </transition>
 
-
     <state id="state.sinfo.collision" description="state.sinfo.collision" state="org.dive4elements.river.artifacts.sinfo.collision.CollisionState" helpText="help.state.sinfo.collision">
       <outputmodes>
-        <outputmode name="collision" description="output.collision" mime-type="image/png" type="chart">
+        <outputmode name="sinfo_collision" description="output.sinfo_collision" mime-type="image/png" type="chart">
           <facets>
-            <!-- REMARK: id's that ends with 'filtered' are handled differently
-              ' -->
+          <!-- 
             <facet name="sinfo_facet_flow_depth.filtered" description="flow depth, filtered by current zoom state" />
             <facet name="sinfo_facet_flow_depth" description="flow depth" />
 
@@ -287,27 +287,25 @@
             <facet name="sinfo_facet_tkh" description="Facet for tkh" />
 
             <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations" />
+           -->
           </facets>
         </outputmode>
 
-        <outputmode name="sinfo_flowdepth_export" description="output.sinfo_flowdepth_export" mime-type="text/plain" type="export">
+        <outputmode name="sinfo_collision_export" description="output.sinfo_collision_export" mime-type="text/plain" type="export">
           <facets>
-            <facet name="csv" description="facet.sinfo_flowdepth_export.csv" />
-            <facet name="pdf" description="facet.sinfo_flowdepth_export.pdf" />
+            <facet name="csv" description="facet.sinfo_collision_export.csv" />
+            <facet name="pdf" description="facet.sinfo_collision_export.pdf" />
           </facets>
         </outputmode>
 
-        <outputmode name="sinfo_flowdepth_report" description="output.sinfo_flowdepth_report" mime-type="text/xml" type="report">
+        <outputmode name="sinfo_collision_report" description="output.sinfo_collision_report" mime-type="text/xml" type="report">
           <facets>
-            <facet name="report" description="facet.sinfo_flowdepth_report" />
+            <facet name="report" description="facet.sinfo_collision_report" />
           </facets>
         </outputmode>
       </outputmodes>
     </state>
 
-
-
-
     <!-- Calculation Mode: Überflutungsdauern Infrastrukturen BWaStr -->
     <!-- Schrittweite benötigt für wq-state: TODO: vermutlich hier auch nicht? -->
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
@@ -342,7 +340,6 @@
       <condition data="calculation_mode" value="sinfo_calc_flood_duration" operator="equal" />
     </transition>
 
-
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.sinfo.wspl" />
       <to state="state.sinfo.wq" />
@@ -361,14 +358,11 @@
       <condition data="calculation_mode" value="sinfo_calc_flood_duration" operator="equal" />
     </transition>
 
-
-
     <state id="state.sinfo.flood_duration" description="state.sinfo.flood_duration" state="org.dive4elements.river.artifacts.sinfo.flood_duration.FloodDurationState" helpText="help.state.sinfo.flood_duration">
       <outputmodes>
-        <outputmode name="flood" description="output.flood" mime-type="image/png" type="chart">
+        <outputmode name="sinfo_flood_duration" description="output.sinfo_flood_duration" mime-type="image/png" type="chart">
           <facets>
-            <!-- REMARK: id's that ends with 'filtered' are handled differently
-              ' -->
+<!-- 
             <facet name="sinfo_facet_flow_depth.filtered" description="flow depth, filtered by current zoom state" />
             <facet name="sinfo_facet_flow_depth" description="flow depth" />
 
@@ -378,32 +372,25 @@
             <facet name="sinfo_facet_tkh" description="Facet for tkh" />
 
             <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations" />
+ -->
           </facets>
         </outputmode>
 
-        <outputmode name="sinfo_flowdepth_export" description="output.sinfo_flowdepth_export" mime-type="text/plain" type="export">
+        <outputmode name="sinfo_flood_duration_export" description="output.sinfo_flood_duration_export" mime-type="text/plain" type="export">
           <facets>
-            <facet name="csv" description="facet.sinfo_flowdepth_export.csv" />
-            <facet name="pdf" description="facet.sinfo_flowdepth_export.pdf" />
+            <facet name="csv" description="facet.sinfo_flood_duration_export.csv" />
+            <facet name="pdf" description="facet.sinfo_flood_duration_export.pdf" />
           </facets>
         </outputmode>
 
-        <outputmode name="sinfo_flowdepth_report" description="output.sinfo_flowdepth_report" mime-type="text/xml" type="report">
+        <outputmode name="sinfo_flood_duration_report" description="output.sinfo_flood_duration_report" mime-type="text/xml" type="report">
           <facets>
-            <facet name="report" description="facet.sinfo_flowdepth_report" />
+            <facet name="report" description="facet.sinfo_flood_duration_report" />
           </facets>
         </outputmode>
       </outputmodes>
     </state>
 
-
-
-
-
-
-
-
-
     <!-- Calculation Mode: Transportkörperhöhen -->
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.sinfo.calculation_mode" />
@@ -444,6 +431,8 @@
 
             <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations" />
 
+            <facet name="sinfo_tkk.manualpoints" description="Manual Points" />
+
             <facet name="sinfo_facet_flow_depth.filtered" description="mean flow depth" />
             <facet name="sinfo_facet_flow_depth" description="mean flow depth" />