--- a/artifacts/doc/conf/meta-data.xml	Mon Oct 14 17:41:19 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Tue Oct 15 07:06:19 2013 +0200
@@ -1619,18 +1619,26 @@
       <single>
         <dc:context>
           <dc:statement>
-            SELECT id          AS bedh_id,
-                   year        AS bedh_year,
-                   description AS bedh_descr
-            FROM bed_height_single
-            WHERE river_id = ${river_id}
-              AND lower(description) NOT LIKE '%epoch%'
+            SELECT bhs.id          AS bedh_id,
+                   bhs.year        AS bedh_year,
+                   bhs.description AS bedh_descr,
+                   bht.id          AS type_id
+            FROM bed_height_single bhs
+               JOIN bed_height_type bht ON bht.id = bhs.type_id
+            WHERE bhs.river_id = ${river_id}
+              AND lower(bhs.description) NOT LIKE '%epoch%'
           </dc:statement>
-          <dc:for-each>
-            <height factory="bedheight" target_out="{$out}"
-                    ids="bedheight-single-{$bedh_id}-{$bedh_year}"
-                    description="{$bedh_descr}"/>
-          </dc:for-each>
+          <dc:if test="dc:has-result()">
+            <dc:group expr="$bedh_year">
+              <cross-sections name="{dc:group-key()}">
+                <dc:for-each>
+                  <height factory="bedheight" target_out="{$out}"
+                      ids="bedheight-single-{$bedh_id}-{$bedh_year}"
+                      description="{$type} {$bedh_descr}"/>
+                </dc:for-each>
+              </cross-sections>
+            </dc:group>
+          <dc:if>
         </dc:context>
       </single>
     </dc:macro>