--- a/flys-artifacts/doc/conf/meta-data.xml	Thu Nov 10 10:29:01 2011 +0000
+++ b/flys-artifacts/doc/conf/meta-data.xml	Thu Nov 10 11:21:20 2011 +0000
@@ -83,6 +83,15 @@
             <dc:attribute name="ids"     value="${river_id}"/>
           </mainvalue>
         </dc:macro>
+
+
+        <dc:macro name="annotations">
+          <annotation>
+            <dc:attribute name="factory" value="annotations"/>
+            <dc:attribute name="ids"     value="${river_id}"/>
+          </annotation>
+        </dc:macro>
+
         <river>
           <dc:attribute name="name" value="${river_name}"/>
           <dc:if test="dc:contains($artifact-outs, 'w_differences')">
@@ -91,6 +100,19 @@
               <dc:attribute name="ids"     value="${river_id}"/>
             </annotation>
           </dc:if>
+
+          <dc:choose>
+            <dc:when test="dc:contains($parameters, 'recommended')">
+               <dc:comment>
+                  Recommendations.
+               </dc:comment>
+               <dc:if test="dc:contains($artifact-outs, 'w_differences') or (dc:contains($artifact-outs, 'discharge_longitudinal_section'))">
+                  <dc:call-macro name="annotations"/>
+               </dc:if>
+            </dc:when>
+            <dc:otherwise>
+            </dc:otherwise>
+          </dc:choose>
           <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'w_differences'))">
             <dc:choose>
               <dc:when test="dc:contains($parameters, 'recommended')">
@@ -442,14 +464,8 @@
           </dc:if>
           <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')">
               <longitudinal-section>
-                <dc:call-macro name="longitudinal_section-recommended"/>
+                <dc:call-macro name="annotations"/>
               </longitudinal-section>
-              <dc:macro name="longitudinal_section-recommended">
-                <annotation>
-                          <dc:attribute name="factory" value="annotations"/>
-                          <dc:attribute name="ids" value="${river_id}"/>
-                </annotation>
-              </dc:macro>
           </dc:if>
           <dc:if test="dc:contains($artifact-outs, 'floodmap')">
               <floodmap>