--- a/artifacts/doc/conf/meta-data.xml	Tue Oct 15 15:06:29 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Tue Oct 15 15:37:24 2013 +0200
@@ -316,19 +316,7 @@
                 <dc:iterate var="out" container="artifact-outs">
                   <dc:choose>
                     <dc:when test="$out = 'longitudinal_section'">
-                      <dc:call-macro name="longitudinal"/>
-                      <dc:call-macro name="differences"/>
-                      <dc:call-macro name="bedheight_differences"/>
-                      <dc:call-macro name="bedquality-bed"/>
-                      <dc:call-macro name="bedquality-load"/>
-                      <dc:call-macro name="flow-velocity"/>
-                      <dc:call-macro name="sediment-load"/>
-                      <dc:call-macro name="bedquality-density"/>
-                      <dc:call-macro name="bedquality-porosity"/>
-                      <dc:call-macro name="waterlevels-discharge"/>
-                      <dc:call-macro name="differenceable-fix"/>
-                      <dc:call-macro name="delta-wt-ls"/>
-                      <dc:call-macro name="longitudinal-section"/>
+                      <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
                     <dc:when test="$out = 'discharge_longitudinal_section'">
                       <dc:call-macro name="longitudinal"/>
@@ -550,8 +538,8 @@
     <dc:macro name="longitudinal">
       <dc:filter expr="$out_name = 'longitudinal_section'">
         <dc:if test="dc:has-result()">
-          <waterlevels>
-            <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation))">
+          <waterlevels_ls>
+            <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)">
               <dc:comment>Aheinecke: Why is this grouping different from the rest?</dc:comment>
               <longitudinal_section_columns description="{dc:group-key()}">
                 <dc:for-each>
@@ -566,19 +554,19 @@
                 </dc:for-each>
               </longitudinal_section_columns>
             </dc:group>
-          </waterlevels>
+          </waterlevels_ls>
         </dc:if>
       </dc:filter>
     </dc:macro>
 
-    <dc:macro name="longitudinal-section">
+    <dc:macro name="longitudinal-section-fix">
       <dc:filter expr="$out_name = 'fix_longitudinal_section_curve' and
         (starts-with($facet_name, 'fix_deviation_ls') or
         starts-with($facet_name, 'fix_sector_average_ls') or
         starts-with($facet_name, 'fix_analysis_events_ls') or
         starts-with($facet_name, 'fix_reference_events_ls'))">
         <dc:if test="dc:has-result()">
-          <waterlevels>
+          <waterlevels_fix>
             <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)">
               <waterlevels description="{dc:group-key()}">
                 <dc:for-each>
@@ -593,7 +581,7 @@
                 </dc:for-each>
               </waterlevels>
             </dc:group>
-          </waterlevels>
+          </waterlevels_fix>
         </dc:if>
       </dc:filter>
     </dc:macro>
@@ -1077,7 +1065,7 @@
     <dc:macro name="waterlevels-discharge">
       <dc:filter expr="$out_name = 'discharge_longitudinal_section' and $facet_name = 'discharge_longitudinal_section.w'">
         <dc:if test="dc:has-result()">
-          <waterlevels-discharge>
+          <waterlevels_discharge>
             <dc:group expr="concat($river, ' ',  dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)">
               <discharge description="{dc:group-key()}">
                 <dc:for-each>
@@ -1092,7 +1080,7 @@
                 </dc:for-each>
               </discharge>
             </dc:group>
-          </waterlevels-discharge>
+          </waterlevels_discharge>
         </dc:if>
       </dc:filter>
     </dc:macro>