--- a/artifacts/doc/conf/artifacts/uinfo.xml	Mon Sep 10 17:06:23 2018 +0200
+++ b/artifacts/doc/conf/artifacts/uinfo.xml	Wed Sep 12 10:55:09 2018 +0200
@@ -3,123 +3,123 @@
 
   <states>
     <state id="state.uinfo.river" description="state.uinfo.river" state="org.dive4elements.river.artifacts.states.RiverSelect" helpText="help.state.uinfo.river">
-      <data name="river" type="String"/>
+      <data name="river" type="String" />
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
-      <from state="state.uinfo.river"/>
-      <to state="state.uinfo.calculation_mode"/>
+      <from state="state.uinfo.river" />
+      <to state="state.uinfo.calculation_mode" />
     </transition>
 
     <state id="state.uinfo.calculation_mode" description="state.uinfo.calculation_mode" state="org.dive4elements.river.artifacts.uinfo.CalculationSelectUinfo" helpText="help.state.uinfo.calculation_mode">
-      <data name="calculation_mode" type="String"/>
+      <data name="calculation_mode" type="String" />
     </state>
 
-    <state id="state.uinfo.veg.distance_only" description="state.uinfo.veg.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlyInundationDurVegSelect"  helpText="help.state.uinfo.vegetationzone.distance_only">
-      <data name="ld_from" type="Double"/>
-      <data name="ld_to" type="Double"/>
+    <state id="state.uinfo.veg.distance_only" description="state.uinfo.veg.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlyInundationDurVegSelect" helpText="help.state.uinfo.vegetationzone.distance_only">
+      <data name="ld_from" type="Double" />
+      <data name="ld_to" type="Double" />
     </state>
 
     <state id="state.uinfo.salix.distance_only" description="state.uinfo.salix.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlySelect" helpText="help.state.uinfo.salix.distance_only">
-      <data name="ld_from" type="Double"/>
-      <data name="ld_to" type="Double"/>
+      <data name="ld_from" type="Double" />
+      <data name="ld_to" type="Double" />
     </state>
     <state id="state.uinfo.inundationduration.distance_only" description="state.uinfo.inundationduration.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlyInundationDurVegSelect" helpText="help.state.uinfo.inundation_duration.location">
-      <data name="ld_from" type="Double"/>
-      <data name="ld_to" type="Double"/>
+      <data name="ld_from" type="Double" />
+      <data name="ld_to" type="Double" />
     </state>
 
     <!-- Calculation Mode: Salix Linie -->
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.calculation_mode"/>
-      <to state="state.uinfo.salix.distance_only"/>
-      <condition data="calculation_mode" value="uinfo_salix_line" operator="equal"/>
-    </transition>
-
-    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.salix.distance_only"/>
-      <to state="state.uinfo.salix.use_scenario"/>
-      <condition data="calculation_mode" value="uinfo_salix_line" operator="equal"/>
-    </transition>
-
-    <state id="state.uinfo.salix.use_scenario" description="state.uinfo.salix.use_scenario" state="org.dive4elements.river.artifacts.uinfo.salix.UseScenarioChoice" helpText="help.state.uinfo.salix.use_scenario">
-      <data name="use_scenario" type="Boolean"/>
-    </state>
-
-    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.salix.use_scenario"/>
-      <to state="state.uinfo.salix.scenario_type"/>
-      <condition data="use_scenario" value="true" operator="equal"/>
-    </transition>
-
-    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.salix.use_scenario"/>
-      <to state="state.uinfo.salix_line"/>
-      <condition data="use_scenario" value="false" operator="equal"/>
-    </transition>
-
-    <state id="state.uinfo.salix.scenario_type" description="state.uinfo.salix.scenario_type" state="org.dive4elements.river.artifacts.uinfo.salix.ScenarioTypeState" helpText="help.state.uinfo.salix.scenario_type">
-      <data name="scenario_selection" type="String"/>
-    </state>
-
-    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.salix.scenario_type"/>
-      <to state="state.uinfo.distance_only_part.from_regional"/>
-      <condition data="scenario_selection" value="scenarioType.option1" operator="equal"/>
-    </transition>
-
-    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.salix.scenario_type"/>
-      <to state="state.uinfo.salix.supraregional"/>
-      <condition data="scenario_selection" value="scenarioType.option2" operator="equal"/>
+      <from state="state.uinfo.calculation_mode" />
+      <to state="state.uinfo.salix.distance_only" />
+      <condition data="calculation_mode" value="uinfo_salix_line" operator="equal" />
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.salix.supraregional"/>
-      <to state="state.uinfo.salix_line"/>
-      <condition data="calculation_mode" value="uinfo_salix_line" operator="equal"/>
+      <from state="state.uinfo.salix.distance_only" />
+      <to state="state.uinfo.salix.use_scenario" />
+      <condition data="calculation_mode" value="uinfo_salix_line" operator="equal" />
     </transition>
 
-    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.salix.scenario_type"/>
-      <to state="state.uinfo.salix.historical.soundings"/>
-      <condition data="scenario_selection" value="scenarioType.option3" operator="equal"/>
-    </transition>
-
-    <state id="state.uinfo.salix.historical.soundings" description="state.uinfo.salix.historical.soundings" state="org.dive4elements.river.artifacts.states.SoundingsSelectSingle" helpText="help.state.uinfo.salix.historical.soundings">
-      <data name="soundings" type="multiattribute"/>
-    </state>
-
-    <state id="state.uinfo.salix.supraregional" description="state.uinfo.salix.supraregional" state="org.dive4elements.river.artifacts.uinfo.salix.SupraRegionalTableState" helpText="help.state.uinfo.salix.supraregional">
-      <data name="supraregional_table" type="String"/>
+    <state id="state.uinfo.salix.use_scenario" description="state.uinfo.salix.use_scenario" state="org.dive4elements.river.artifacts.uinfo.salix.UseScenarioChoice" helpText="help.state.uinfo.salix.use_scenario">
+      <data name="use_scenario" type="Boolean" />
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.salix.historical.soundings"/>
-      <to state="state.uinfo.distance_only_part.historical"/>
-      <condition data="calculation_mode" value="uinfo_salix_line" operator="equal"/>
+      <from state="state.uinfo.salix.use_scenario" />
+      <to state="state.uinfo.salix.scenario_type" />
+      <condition data="use_scenario" value="true" operator="equal" />
     </transition>
 
-    <state id="state.uinfo.distance_only_part.historical" description="state.uinfo.distance_only_part.historical" state="org.dive4elements.river.artifacts.uinfo.salix.DistanceOnlyPartHistoricalSelect" helpText="help.state.uinfo.salix.historical.distance_only_part">
-      <data name="ld_from_part" type="Double"/>
-      <data name="ld_to_part" type="Double"/>
-      <data name="bedheights_for_part" type="Double"/>
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.salix.use_scenario" />
+      <to state="state.uinfo.salix_line" />
+      <condition data="use_scenario" value="false" operator="equal" />
+    </transition>
+
+    <state id="state.uinfo.salix.scenario_type" description="state.uinfo.salix.scenario_type" state="org.dive4elements.river.artifacts.uinfo.salix.ScenarioTypeState" helpText="help.state.uinfo.salix.scenario_type">
+      <data name="scenario_selection" type="String" />
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.distance_only_part.historical"/>
-      <to state="state.uinfo.salix_line"/>
-      <condition data="calculation_mode" value="uinfo_salix_line" operator="equal"/>
+      <from state="state.uinfo.salix.scenario_type" />
+      <to state="state.uinfo.distance_only_part.from_regional" />
+      <condition data="scenario_selection" value="scenarioType.option1" operator="equal" />
+    </transition>
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.salix.scenario_type" />
+      <to state="state.uinfo.salix.supraregional" />
+      <condition data="scenario_selection" value="scenarioType.option2" operator="equal" />
+    </transition>
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.salix.supraregional" />
+      <to state="state.uinfo.salix_line" />
+      <condition data="calculation_mode" value="uinfo_salix_line" operator="equal" />
+    </transition>
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.salix.scenario_type" />
+      <to state="state.uinfo.salix.historical.soundings" />
+      <condition data="scenario_selection" value="scenarioType.option3" operator="equal" />
+    </transition>
+
+    <state id="state.uinfo.salix.historical.soundings" description="state.uinfo.salix.historical.soundings" state="org.dive4elements.river.artifacts.states.SoundingsSelectSingle" helpText="help.state.uinfo.salix.historical.soundings">
+      <data name="soundings" type="multiattribute" />
+    </state>
+
+    <state id="state.uinfo.salix.supraregional" description="state.uinfo.salix.supraregional" state="org.dive4elements.river.artifacts.uinfo.salix.SupraRegionalTableState" helpText="help.state.uinfo.salix.supraregional">
+      <data name="supraregional_table" type="String" />
+    </state>
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.salix.historical.soundings" />
+      <to state="state.uinfo.distance_only_part.historical" />
+      <condition data="calculation_mode" value="uinfo_salix_line" operator="equal" />
+    </transition>
+
+    <state id="state.uinfo.distance_only_part.historical" description="state.uinfo.distance_only_part.historical" state="org.dive4elements.river.artifacts.uinfo.salix.DistanceOnlyPartHistoricalSelect" helpText="help.state.uinfo.salix.historical.distance_only_part">
+      <data name="ld_from_part" type="Double" />
+      <data name="ld_to_part" type="Double" />
+      <data name="bedheights_for_part" type="Double" />
+    </state>
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.distance_only_part.historical" />
+      <to state="state.uinfo.salix_line" />
+      <condition data="calculation_mode" value="uinfo_salix_line" operator="equal" />
     </transition>
 
     <state id="state.uinfo.salix.load.scenario.regional" description="state.uinfo.salix.load.scenario.regional" state="org.dive4elements.river.artifacts.uinfo.salix.LoadScenarioSelectLimit5" helpText="help.state.uinfo.salix.regional">
-      <data name="sedimentheight" type="String" /> <!-- mittelwasserlage in cm!  -->
+      <data name="sedimentheight" type="String" /> <!-- mittelwasserlage in cm! -->
     </state>
 
     <state id="state.uinfo.distance_only_part.from_regional" description="state.uinfo.distance_only_part.from_regional" state="org.dive4elements.river.artifacts.states.DistanceOnlyPartSelect" helpText="help.state.uinfo.salix.regional">
-      <data name="ld_from_part" type="Double"/>
-      <data name="ld_to_part" type="Double"/>
+      <data name="ld_from_part" type="Double" />
+      <data name="ld_to_part" type="Double" />
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
@@ -138,48 +138,48 @@
       <outputmodes>
         <outputmode name="uinfo_salix_line" description="output.uinfo_salix_line" mime-type="image/png" type="chart">
           <facets>
-            <facet name="uinfo_facet_salix_line.filtered" description="salix line, filtered by current zoom state"/>
-            <facet name="uinfo_facet_salix_line" description="salix line"/>
-            <facet name="uinfo_facet_salix_mnwmw.filtered" description="nmw-mw differences, filtered by current zoom state"/>
-            <facet name="uinfo_facet_salix_mnwmw" description="mnw-mw differences"/>
-            <facet name="uinfo_facet_salix_scenario.filtered" description="scenario salix line, filtered by current zoom state"/>
-            <facet name="uinfo_facet_salix_scenario" description="scenario salix line"/>
-            <facet name="uinfo_facet_salix_rank" description="salix ranks"/>
+            <facet name="uinfo_facet_salix_line.filtered" description="salix line, filtered by current zoom state" />
+            <facet name="uinfo_facet_salix_line" description="salix line" />
+            <facet name="uinfo_facet_salix_mnwmw.filtered" description="nmw-mw differences, filtered by current zoom state" />
+            <facet name="uinfo_facet_salix_mnwmw" description="mnw-mw differences" />
+            <facet name="uinfo_facet_salix_scenario.filtered" description="scenario salix line, filtered by current zoom state" />
+            <facet name="uinfo_facet_salix_scenario" description="scenario salix line" />
+            <facet name="uinfo_facet_salix_rank" description="salix ranks" />
           </facets>
         </outputmode>
 
         <outputmode name="cross_section" description="output.cross_section" mime-type="image/png" type="chart">
           <facets>
-            <facet name="uinfo_facet_salix_line_cross_section_water_line" description="Saxlix Line"/>
-            <facet name="uinfo_facet_salix_scenario_cross_section_water_line" description="Salix Lines of scenarios"/>
-            <facet name="uinfo_facet_salix_waterlevel_mnw_cross_section_water_line" description="Waterlevels used during salix line calculation"/>
-            <facet name="uinfo_facet_salix_waterlevel_mw_cross_section_water_line" description="Waterlevels used during salix line calculation"/>
-            <facet name="uinfo_facet_salix_waterlevel_mhw_cross_section_water_line" description="Waterlevels used during salix line calculation"/>
-            <facet name="uinfo_facet_salix_waterlevel_hw5_cross_section_water_line" description="Waterlevels used during salix line calculation"/>
+            <facet name="uinfo_facet_salix_line_cross_section_water_line" description="Saxlix Line" />
+            <facet name="uinfo_facet_salix_scenario_cross_section_water_line" description="Salix Lines of scenarios" />
+            <facet name="uinfo_facet_salix_waterlevel_mnw_cross_section_water_line" description="Waterlevels used during salix line calculation" />
+            <facet name="uinfo_facet_salix_waterlevel_mw_cross_section_water_line" description="Waterlevels used during salix line calculation" />
+            <facet name="uinfo_facet_salix_waterlevel_mhw_cross_section_water_line" description="Waterlevels used during salix line calculation" />
+            <facet name="uinfo_facet_salix_waterlevel_hw5_cross_section_water_line" description="Waterlevels used during salix line calculation" />
 
-            <facet name="cross_section" description="facet.cross_section"/>
-            <facet name="area" description="an area"/>
-            <facet name="cross_section.area" description="an area"/>
-            <facet name="cross_section.manualpoints" description="points"/>
-            <facet name="cross_section.manualline" description="line"/>
+            <facet name="cross_section" description="facet.cross_section" />
+            <facet name="area" description="an area" />
+            <facet name="cross_section.area" description="an area" />
+            <facet name="cross_section.manualpoints" description="points" />
+            <facet name="cross_section.manualline" description="line" />
 
             <!--
-              This would automatically import some existing hyks, but we do not want this here 
+              This would automatically import some existing hyks, but we do not want this here
               <facet name="hyk" description="hyks"/>
-             -->
+            -->
           </facets>
         </outputmode>
 
         <outputmode name="uinfo_salix_line_export" description="output.uinfo_salix_line_export" mime-type="text/plain" type="export">
           <facets>
-            <facet name="csv" description="facet.uinfo_salix_line_export.csv"/>
-            <facet name="pdf" description="facet.uinfo_salix_line_export.pdf"/>
+            <facet name="csv" description="facet.uinfo_salix_line_export.csv" />
+            <facet name="pdf" description="facet.uinfo_salix_line_export.pdf" />
           </facets>
         </outputmode>
 
         <outputmode name="uinfo_salix_line_report" description="output.uinfo_salix_line_report" mime-type="text/xml" type="report">
           <facets>
-            <facet name="report" description="facet.uinfo_salix_line_report"/>
+            <facet name="report" description="facet.uinfo_salix_line_report" />
           </facets>
         </outputmode>
       </outputmodes>
@@ -189,78 +189,89 @@
     <!-- Calculation Mode: Inundation Duration -->
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.calculation_mode"/>
-      <to state="state.uinfo.inundationduration.distance_only"/>
-      <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal"/>
-    </transition>
-
-    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.inundationduration.distance_only"/>
-      <to state="state.uinfo.inundation.year_totalepoch"/>
-      <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal"/>
+      <from state="state.uinfo.calculation_mode" />
+      <to state="state.uinfo.inundationduration.distance_only" />
+      <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal" />
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.inundation.year_totalepoch"/>
-      <to state="state.uinfo.inundation.load.year"/>
-      <condition data="ye_select" value="state.uinfo.year" operator="equal"/>
+      <from state="state.uinfo.inundationduration.distance_only" />
+      <to state="state.uinfo.inundation.year_totalepoch" />
+      <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal" />
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.inundation.year_totalepoch"/>
-      <to state="state.uinfo.inundation.use_scenario"/>
-      <condition data="ye_select" value="state.uinfo.totalepoch" operator="equal"/>
+      <from state="state.uinfo.inundation.year_totalepoch" />
+      <to state="state.uinfo.inundation.load.year" />
+      <condition data="ye_select" value="state.uinfo.year" operator="equal" />
+    </transition>
+
+ <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.inundation.year_totalepoch" />
+      <to state="state.uinfo.inundation.load.epoch" />
+      <condition data="ye_select" value="state.uinfo.epoch" operator="equal" />
     </transition>
 
     <state id="state.uinfo.inundation.year_totalepoch" description="state.uinfo.inundation.year_totalepoch" state="org.dive4elements.river.artifacts.uinfo.inundationduration.YearChoice" helpText="help.state.uinfo.inundation.year_totalepoch">
-      <data name="ye_select" type="String"/>
+      <data name="ye_select" type="String" />
     </state>
 
-    <state id="state.uinfo.inundation.load.year" description="state.uinfo.inundation.load.year" state="org.dive4elements.river.artifacts.uinfo.inundationduration.LoadSingleYearSelectState" helpText="help.state.uinfo.inundation.load.year">
-      <data name="singleyear" type="String"/>
+    <state id="state.uinfo.inundation.load.year" description="state.uinfo.inundation.load.year" state="org.dive4elements.river.artifacts.uinfo.inundationduration.WMSYearSelectState" helpText="help.state.uinfo.inundation.load.year">
+      <data name="year_epoch_select" type="String" />
     </state>
 
+    <state id="state.uinfo.inundation.load.epoch" description="state.uinfo.inundation.load.epoch" state="org.dive4elements.river.artifacts.uinfo.inundationduration.WMSEpochSelectState" helpText="help.state.uinfo.inundation.load.epoch">
+      <data name="year_epoch_select" type="String" />
+    </state>
+
+
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.inundation.load.year"/>
-      <to state="state.uinfo.inundation.use_scenario"/>
-      <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal"/>
+      <from state="state.uinfo.inundation.load.year" />
+      <to state="state.uinfo.inundation.use_scenario" />
+      <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal" />
+    </transition>
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.uinfo.inundation.load.epoch" />
+      <to state="state.uinfo.inundation.use_scenario" />
+      <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal" />
     </transition>
 
     <!-- Doppelter State, andere ID, damit keine Mehrfach-Condition benötigt wird -->
     <state id="state.uinfo.inundation.use_scenario" description="state.uinfo.inundation.use_scenario" state="org.dive4elements.river.artifacts.uinfo.salix.UseScenarioChoice" helpText="help.state.uinfo.inundation.use_scenario">
-      <data name="use_scenario" type="Boolean"/>
+      <data name="use_scenario" type="Boolean" />
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.inundation.use_scenario"/>
-      <to state="state.uinfo.inundation.scenario"/>
-      <condition data="use_scenario" value="true" operator="equal"/>
+      <from state="state.uinfo.inundation.use_scenario" />
+      <to state="state.uinfo.inundation.load.scenario" />
+      <condition data="use_scenario" value="true" operator="equal" />
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.inundation.use_scenario"/>
-      <to state="state.uinfo.inundation.vegetation"/>
-      <condition data="use_scenario" value="false" operator="equal"/>
+      <from state="state.uinfo.inundation.use_scenario" />
+      <to state="state.uinfo.inundation.vegetation" />
+      <condition data="use_scenario" value="false" operator="equal" />
     </transition>
 
-    <state id="state.uinfo.inundation.scenario" description="state.uinfo.inundation.scenario" state="org.dive4elements.river.artifacts.uinfo.inundationduration.LoadScenarioSelect" helpText="help.state.uinfo.inundation.scenario">
-      <data name="sedimentheight" type="String"/> <!-- mittelwasserlage in cm! -->
+    <state id="state.uinfo.inundation.load.scenario" description="state.uinfo.inundation.load.scenario" state="org.dive4elements.river.artifacts.uinfo.inundationduration.LoadScenarioSelect" helpText="help.state.uinfo.inundation.scenario">
+      <data name="sedimentheight" type="String" /> <!-- mittelwasserlage in cm! -->
     </state>
 
     <state id="state.uinfo.inundation.vegetation" description="state.uinfo.inundation.vegetation" state="org.dive4elements.river.artifacts.uinfo.vegetationzones.VegetationZonesTableState" helpText="help.state.uinfo.inundation.vegetation">
-      <data name="vegzones" type="String"/>
+      <data name="vegzones" type="String" />
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.inundation.scenario"/>
-      <to state="state.uinfo.inundation.vegetation"/>
-      <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal"/>
+      <from state="state.uinfo.inundation.load.scenario" />
+      <to state="state.uinfo.inundation.vegetation" />
+      <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal" />
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.inundation.vegetation"/>
-      <to state="state.uinfo.inundation_duration"/>
-      <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal"/>
+      <from state="state.uinfo.inundation.vegetation" />
+      <to state="state.uinfo.inundation_duration" />
+      <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal" />
     </transition>
 
     <state id="state.uinfo.inundation_duration" description="state.uinfo.inundation_duration" state="org.dive4elements.river.artifacts.uinfo.inundationduration.InundationDurationState" helpText="help.state.uinfo.inundation_duration">
@@ -268,43 +279,43 @@
 
         <outputmode name="map" description="output.uesk.map.description" type="map">
           <facets>
-            <facet name="floodmap.wsplgen"/>
-            <facet name="floodmap.barriers"/>
-            <facet name="floodmap.riveraxis"/>
-            <facet name="floodmap.wmsbackground"/>
-            <facet name="floodmap.kms"/>
-            <facet name="floodmap.qps"/>
-            <facet name="floodmap.hws_lines"/>
-            <facet name="floodmap.hws_points"/>
-            <facet name="floodmap.hydr_boundaries"/>
-            <facet name="floodmap.hydr_boundaries_poly"/>
-            <facet name="floodmap.catchment"/>
-            <facet name="floodmap.floodplain"/>
-            <facet name="floodmap.floodmarks"/>
-            <facet name="floodmap.lines"/>
-            <facet name="floodmap.buildings"/>
-            <facet name="floodmap.fixpoints"/>
-            <facet name="floodmap.floodmaps"/>
-            <facet name="floodmap.gauge_location"/>
-            <facet name="floodmap.externalwms"/>
-            <facet name="floodmap.externalwms_1"/>
-            <facet name="floodmap.externalwms_2"/>
-            <facet name="floodmap.externalwms_3"/>
-            <facet name="floodmap.externalwms_4"/>
-            <facet name="floodmap.jetties"/>
+            <facet name="floodmap.wsplgen" />
+            <facet name="floodmap.barriers" />
+            <facet name="floodmap.riveraxis" />
+            <facet name="floodmap.wmsbackground" />
+            <facet name="floodmap.kms" />
+            <facet name="floodmap.qps" />
+            <facet name="floodmap.hws_lines" />
+            <facet name="floodmap.hws_points" />
+            <facet name="floodmap.hydr_boundaries" />
+            <facet name="floodmap.hydr_boundaries_poly" />
+            <facet name="floodmap.catchment" />
+            <facet name="floodmap.floodplain" />
+            <facet name="floodmap.floodmarks" />
+            <facet name="floodmap.lines" />
+            <facet name="floodmap.buildings" />
+            <facet name="floodmap.fixpoints" />
+            <facet name="floodmap.floodmaps" />
+            <facet name="floodmap.gauge_location" />
+            <facet name="floodmap.externalwms" />
+            <facet name="floodmap.externalwms_1" />
+            <facet name="floodmap.externalwms_2" />
+            <facet name="floodmap.externalwms_3" />
+            <facet name="floodmap.externalwms_4" />
+            <facet name="floodmap.jetties" />
           </facets>
         </outputmode>
 
         <!-- FIXME: i01n name in FLYSConstants -->
         <outputmode name="uinfo_inundation_duration_export" description="output.uinfo_inundation_duration_export" mime-type="text/plain" type="export">
           <facets>
-            <facet name="wms_url" description="XXXXXXXXXX _ no entry in generators necessary either"/>
+            <facet name="wms_url" description="XXXXXXXXXX _ no entry in generators necessary either" />
           </facets>
         </outputmode>
 
         <outputmode name="uinfo_inundation_duration_report" description="output.uinfo_inundation_duration_report" mime-type="text/xml" type="report">
           <facets>
-            <facet name="report" description="facet.uinfo_inundation_duration_report"/>
+            <facet name="report" description="facet.uinfo_inundation_duration_report" />
           </facets>
         </outputmode>
       </outputmodes>
@@ -314,25 +325,25 @@
     <!-- Calculation Mode: Vegetation Zones -->
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.calculation_mode"/>
-      <to state="state.uinfo.veg.distance_only"/>
-      <condition data="calculation_mode" value="uinfo_vegetation_zones" operator="equal"/>
+      <from state="state.uinfo.calculation_mode" />
+      <to state="state.uinfo.veg.distance_only" />
+      <condition data="calculation_mode" value="uinfo_vegetation_zones" operator="equal" />
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.veg.distance_only"/>
-      <to state="state.uinfo.vegetation_zones.table"/>
-      <condition data="calculation_mode" value="uinfo_vegetation_zones" operator="equal"/>
+      <from state="state.uinfo.veg.distance_only" />
+      <to state="state.uinfo.vegetation_zones.table" />
+      <condition data="calculation_mode" value="uinfo_vegetation_zones" operator="equal" />
     </transition>
 
     <state id="state.uinfo.vegetation_zones.table" description="state.uinfo.vegetation_zones.table" state="org.dive4elements.river.artifacts.uinfo.vegetationzones.VegetationZonesTableEditState" helpText="help.state.uinfo.vegetation_zones">
-      <data name="vegzones" type="String"/>
+      <data name="vegzones" type="String" />
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.vegetation_zones.table"/>
-      <to state="state.uinfo.vegetation_zones"/>
-      <condition data="calculation_mode" value="uinfo_vegetation_zones" operator="equal"/>
+      <from state="state.uinfo.vegetation_zones.table" />
+      <to state="state.uinfo.vegetation_zones" />
+      <condition data="calculation_mode" value="uinfo_vegetation_zones" operator="equal" />
     </transition>
 
     <state id="state.uinfo.vegetation_zones" description="state.uinfo.vegetation_zones" state="org.dive4elements.river.artifacts.uinfo.vegetationzones.VegetationZonesState" helpText="help.state.uinfo.vegetation_zones">
@@ -341,15 +352,15 @@
         <!-- FIXME: i01n name in FLYSConstants -->
         <outputmode name="uinfo_vegetation_zones_export" description="output.uinfo_vegetation_zones_export" mime-type="text/plain" type="export">
           <facets>
-            <facet name="csv" description="facet.uinfo_vegetation_zones_export.csv"/>
-            <facet name="pdf" description="facet.uinfo_vegetation_zones_export.pdf"/>
+            <facet name="csv" description="facet.uinfo_vegetation_zones_export.csv" />
+            <facet name="pdf" description="facet.uinfo_vegetation_zones_export.pdf" />
           </facets>
         </outputmode>
 
         <!-- FIXME: i01n name in FLYSConstants -->
         <outputmode name="uinfo_vegetation_zones_report" description="output.uinfo_vegetation_zones_report" mime-type="text/xml" type="report">
           <facets>
-            <facet name="report" description="facet.uinfo_vegetation_zones_report"/>
+            <facet name="report" description="facet.uinfo_vegetation_zones_report" />
           </facets>
         </outputmode>
       </outputmodes>