--- a/artifacts/doc/conf/meta-data.xml	Fri Jun 28 21:08:23 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Sat Jun 29 00:06:35 2013 +0200
@@ -45,7 +45,10 @@
               </dc:comment>
               <dc:iterate var="out" container="artifact-outs">
                 <dc:choose>
-                  <dc:when test="dc:contains($out, 'longitudinal_section')">
+                  <dc:when test="$out = 'w_differences'">
+                    <dc:call-macro name="annotations"/>
+                  </dc:when>
+                  <dc:when test="$out = 'discharge_longitudinal_section'">
                     <dc:call-macro name="annotations"/>
                     <dc:call-macro name="officiallines_user"/>
                   </dc:when>
@@ -105,6 +108,9 @@
                       <dc:call-macro name="bed-heights-epoch"/>
                     </bedheights>
                   </dc:when>
+                  <dc:when test="$out = 'sedimentload_ls'">
+                    <dc:call-macro name="annotations"/>
+                  </dc:when>
                 </dc:choose>
               </dc:iterate>
             </dc:when>
@@ -127,7 +133,7 @@
                   <dc:when test="$out = 'longitudinal_section'">
                     <dc:call-macro name="longitudinal-section-prototype"/>
                   </dc:when>
-                  <dc:when test="$out = 'w_differences_longitudinal_section'">
+                  <dc:when test="$out = 'w_differences'">
                     <dc:call-macro name="longitudinal-section-prototype"/>
                   </dc:when>
                   <dc:when test="$out = 'discharge_longitudinal_section'">
@@ -166,18 +172,18 @@
                   <dc:when test="$out = 'map'">
                     <dc:call-macro name="flood-map-complete"/>
                   </dc:when>
-                  <dc:when test="$out = 'flow_velocity_longitudinal_section'">
+                  <dc:when test="$out = 'flow_velocity'">
                     <dc:call-macro name="annotations_per_type"/>
                     <dc:call-macro name="flow_velocity_measurements"/>
                   </dc:when>
                   <dc:when test="$out = 'bed_longitudinal_section'">
                     <dc:call-macro name="annotations_per_type"/>
                   </dc:when>
-                  <dc:when test="$out = 'sedimentload_longitudinal_section'">
+                  <dc:when test="$out = 'sedimentload_ls'">
                     <dc:call-macro name="annotations_per_type"/>
                     <dc:call-macro name="morph_width"/>
                   </dc:when>
-                  <dc:when test="$out = 'bedheight_middle_longitudinal_section'">
+                  <dc:when test="$out = 'bedheight_middle'">
                     <dc:call-macro name="sounding-width"/>
                     <dc:call-macro name="basedata_0"/>
                     <dc:call-macro name="basedata_1_additionals"/>
@@ -185,7 +191,7 @@
                     <dc:call-macro name="basedata_3_officials"/>
                     <dc:call-macro name="annotations_per_type"/>
                   </dc:when>
-                  <dc:when test="$out = 'bed_difference_height_year_longitudinal_section'">
+                  <dc:when test="$out = 'bed_difference_height_year'">
                     <dc:call-macro name="basedata_0"/>
                     <dc:call-macro name="basedata_1_additionals"/>
                     <dc:call-macro name="basedata_2_fixations"/>
@@ -194,7 +200,7 @@
                     <dc:call-macro name="annotations_per_type"/>
                     <dc:call-macro name="morph_width"/>
                   </dc:when>
-                  <dc:when test="$out = 'bed_difference_year_longitudinal_section'">
+                  <dc:when test="$out = 'bed_difference_year'">
                     <dc:call-macro name="basedata_0"/>
                     <dc:call-macro name="basedata_1_additionals"/>
                     <dc:call-macro name="basedata_2_fixations"/>
@@ -203,7 +209,7 @@
                     <dc:call-macro name="annotations_per_type"/>
                     <dc:call-macro name="morph_width"/>
                   </dc:when>
-                  <dc:when test="$out = 'bed_difference_epoch_longitudinal_section'">
+                  <dc:when test="$out = 'bed_difference_epoch'">
                     <dc:call-macro name="basedata_0"/>
                     <dc:call-macro name="basedata_1_additionals"/>
                     <dc:call-macro name="basedata_2_fixations"/>
@@ -310,7 +316,7 @@
                       <dc:call-macro name="longitudinal"/>
                       <dc:call-macro name="differences"/>
                     </dc:when>
-                    <dc:when test="$out = 'w_differences_longitudinal_section'">
+                    <dc:when test="$out = 'w_differences'">
                       <dc:call-macro name="longitudinal"/>
                       <dc:call-macro name="differences"/>
                     </dc:when>
@@ -350,14 +356,14 @@
                     <dc:when test="$out = 'map'">
                       <dc:call-macro name="flood-map"/>
                     </dc:when>
-                    <dc:when test="$out = 'bedheight_middle_longitudinal_section'">
+                    <dc:when test="$out = 'bedheight_middle'">
                       <dc:call-macro name="waterlevels-discharge"/>
                       <dc:call-macro name="waterlevels-fix"/>
                     </dc:when>
                     <dc:when test="$out = 'floodmap-hws'">
                       <dc:call-macro name="floodmap-hws-user"/>
                     </dc:when>
-                    <dc:when test="$out = 'flow_velocity_longitudinal_section'">
+                    <dc:when test="$out = 'flow_velocity'">
                       <dc:call-macro name="bedquality-bed"/>
                       <dc:call-macro name="bedquality-load"/>
                     </dc:when>
@@ -367,20 +373,20 @@
                       <dc:call-macro name="bedquality-density"/>
                       <dc:call-macro name="bedquality-porosity"/>
                     </dc:when>
-                    <dc:when test="$out = 'sedimentload_longitudinal_section'">
+                    <dc:when test="$out = 'sedimentload_ls'">
                       <dc:call-macro name="differences"/>
                       <dc:call-macro name="bedheight-differences"/>
                       <dc:call-macro name="flow-velocity"/>
                       <dc:call-macro name="sediment-load"/>
                     </dc:when>
-                    <dc:when test="$out = 'bed_difference_year_longitudinal_section'">
+                    <dc:when test="$out = 'bed_difference_year'">
                       <dc:call-macro name="waterlevels-discharge"/>
                       <dc:call-macro name="bedheight-differences"/>
                       <dc:call-macro name="differences"/>
                       <dc:call-macro name="waterlevels-fix"/>
                       <dc:call-macro name="delta-wt-ls"/>
                     </dc:when>
-                    <dc:when test="$out = 'bed_difference_epoch_longitudinal_section'">
+                    <dc:when test="$out = 'bed_difference_epoch'">
                       <dc:call-macro name="waterlevels-discharge"/>
                       <dc:call-macro name="bedheight-differences"/>
                       <dc:call-macro name="differences"/>
@@ -408,7 +414,7 @@
                 factory="winfo" target_out="{$out}"
                 artifact-id="{$aid}"
                 ids="{$aid}"
-                out="w_differences_longitudinal_section"/>
+                out="w_differences"/>
             </dc:for-each>
           </differences>
         </dc:if>
@@ -822,7 +828,7 @@
     </dc:macro>
 
     <dc:macro name="flow-velocity">
-      <dc:filter expr="$out_name = 'flow_velocity_longitudinal_section' and
+      <dc:filter expr="$out_name = 'flow_velocity' and
         ($facet_name = 'flow_velocity.totalchannel' or
          $facet_name = 'flow_velocity.mainchannel' or
          $facet_name = 'flow_velocity.totalchannel.filtered' or
@@ -838,7 +844,7 @@
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                     <dc:attribute name="artifact-id" value="${a_id}"/>
-                    <dc:attribute name="out" value="flow_velocity_longitudinal_section"/>
+                    <dc:attribute name="out" value="flow_velocity"/>
                   </dc:element>
                 </dc:for-each>
               </flow>
@@ -849,7 +855,7 @@
     </dc:macro>
 
     <dc:macro name="sediment-load">
-      <dc:filter expr="$out_name = 'sedimentload_longitudinal_section' and starts-with($facet_name, 'sedimentload')">
+      <dc:filter expr="$out_name = 'sedimentload_ls' and starts-with($facet_name, 'sedimentload')">
         <dc:if test="dc:has-result()">
           <sediment-load>
             <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)">
@@ -861,7 +867,7 @@
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                     <dc:attribute name="artifact-id" value="${a_id}"/>
-                    <dc:attribute name="out" value="sedimentload_longitudinal_section"/>
+                    <dc:attribute name="out" value="sedimentload_ls"/>
                   </dc:element>
                 </dc:for-each>
               </load>
@@ -872,7 +878,7 @@
     </dc:macro>
 
     <dc:macro name="bedheight-differences">
-      <dc:filter expr="($out_name = 'bed_difference_year_longitudinal_section' or $out_name = 'bed_difference_epoch_longitudinal_section') and
+      <dc:filter expr="($out_name = 'bed_difference_year' or $out_name = 'bed_difference_epoch') and
         (starts-with($facet_name, 'bedheight_difference.year') or starts-with($facet_name, 'bedheight_difference.epoch'))">
         <dc:if test="dc:has-result()">
           <bedheight-differences>