--- a/artifacts/doc/conf/meta-data.xml	Mon Sep 22 17:10:23 2014 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Mon Sep 22 17:11:20 2014 +0200
@@ -2,17 +2,7 @@
 <dc:template xmlns:dc="http://www.intevation.org/2011/Datacage">
   <datacage>
 
-    <dc:comment>
-      User specific part
-      ------------------
-      Since rev 4b29bb2c785f we (only?) need this hack to suppress
-      user-content in DEM-selection during floodmap parameterisation.
-    </dc:comment>
-    <dc:if test="dc:contains($parameters, 'user-id') and
-      not(dc:contains($artifact-outs, 'floodmap-hws')) and
-      not($current-state-id = 'state.winfo.uesk.dgm')">
-      <dc:call-macro name="load-user"/>
-    </dc:if>
+    <dc:call-macro name="load-user"/>
 
     <dc:call-macro name="load-system"/>
 
@@ -47,6 +37,7 @@
               <dc:iterate var="out" container="artifact-outs">
                 <dc:message>Rec out iteration for: {$out}</dc:message>
                 <dc:choose>
+                  <dc:comment> Longitudinal sections </dc:comment>
                   <dc:when test="$out = 'w_differences'">
                     <dc:call-macro name="annotations"/>
                   </dc:when>
@@ -54,33 +45,6 @@
                     <dc:call-macro name="annotations"/>
                     <dc:call-macro name="officiallines_user"/>
                   </dc:when>
-                  <dc:when test="$out = 'historical_discharge_wq'">
-                    <dc:call-macro name="mainvalues"/>
-                  </dc:when>
-                  <dc:when test="$out = 'cross_section'">
-                    <dc:call-macro name="cross_sections"/>
-                    <dc:call-macro name="hyks"/>
-                    <dc:call-macro name="officiallines_user"/>
-                  </dc:when>
-                  <dc:when test="$out = 'discharge_curve'">
-                    <dc:call-macro name="mainvalues"/>
-                    <dc:call-macro name="basedata_3_officials_wq"/>
-                  </dc:when>
-                  <dc:when test="$out = 'computed_discharge_curve'">
-                    <dc:call-macro name="mainvalues"/>
-                    <dc:call-macro name="basedata_3_officials_wq"/>
-                    <dc:call-macro name="basedata_2_fixations_wqkms"/>
-                  </dc:when>
-                  <dc:when test="$out = 'duration_curve'">
-                    <dc:call-macro name="mainvalues"/>
-                  </dc:when>
-                  <dc:when test="$out = 'reference_curve'">
-                    <dc:call-macro name="mainvalues"/>
-                  </dc:when>
-                  <dc:when test="$out = 'fix_wq_curve'">
-                    <dc:call-macro name="mainvalues"/>
-                    <dc:call-macro name="qsectors"/>
-                  </dc:when>
                   <dc:when test="$out = 'longitudinal_section'">
                     <dc:call-macro name="annotations"/>
                     <dc:call-macro name="officiallines_user"/>
@@ -99,20 +63,6 @@
                     <dc:call-macro name="annotations"/>
                     <dc:call-macro name="basedata_6_delta_w"/>
                   </dc:when>
-                  <dc:when test="$out = 'floodmap'">
-                    <dc:call-macro name="flood-map-recommended"/>
-                  </dc:when>
-                  <dc:when test="$out = 'floodmap-hws'">
-                    <dc:call-macro name="flood-map-recommended"/>
-                  </dc:when>
-                  <dc:when test="$out = 'minfo-heights'">
-                    <dc:call-macro name="minfo-heights"/>
-                  </dc:when>
-                  <dc:when test="$out = 'minfo-heights-epoch'">
-                    <bedheights>
-                      <dc:call-macro name="bed-heights-epoch"/>
-                    </bedheights>
-                  </dc:when>
                   <dc:when test="$out = 'sedimentload_ls'">
                     <dc:call-macro name="annotations"/>
                     <dc:call-macro name="sedimentload_off_epochs"/>
@@ -123,6 +73,41 @@
                   <dc:when test="$out = 'flow_velocity'">
                     <dc:call-macro name="annotations"/>
                   </dc:when>
+                  <dc:comment> Discharge curves </dc:comment>
+                  <dc:when test="$out = 'historical_discharge_wq'">
+                    <dc:call-macro name="mainvalues"/>
+                  </dc:when>
+                  <dc:when test="$out = 'discharge_curve'">
+                    <dc:call-macro name="mainvalues"/>
+                    <dc:call-macro name="basedata_3_officials_wq"/>
+                  </dc:when>
+                  <dc:when test="$out = 'computed_discharge_curve'">
+                    <dc:call-macro name="mainvalues"/>
+                    <dc:call-macro name="basedata_3_officials_wq"/>
+                    <dc:call-macro name="basedata_2_fixations_wqkms"/>
+                  </dc:when>
+                  <dc:when test="$out = 'fix_wq_curve'">
+                    <dc:call-macro name="mainvalues"/>
+                    <dc:call-macro name="qsectors"/>
+                  </dc:when>
+                  <dc:comment> Cross sections </dc:comment>
+                  <dc:when test="$out = 'cross_section'">
+                    <dc:call-macro name="cross_sections"/>
+                    <dc:call-macro name="hyks"/>
+                    <dc:call-macro name="officiallines_user"/>
+                  </dc:when>
+                  <dc:comment> Duration curve </dc:comment>
+                  <dc:when test="$out = 'duration_curve'">
+                    <dc:call-macro name="mainvalues"/>
+                  </dc:when>
+                  <dc:comment> Reference curve </dc:comment>
+                  <dc:when test="$out = 'reference_curve'">
+                    <dc:call-macro name="mainvalues"/>
+                  </dc:when>
+                  <dc:comment> Maps </dc:comment>
+                  <dc:when test="$out = 'floodmap'">
+                    <dc:call-macro name="flood-map-recommended"/>
+                  </dc:when>
                 </dc:choose>
               </dc:iterate>
             </dc:when>
@@ -133,19 +118,37 @@
               <dc:iterate var="out" container="artifact-outs">
                 <dc:message>Non Rec out iteration for: {$out}</dc:message>
                 <dc:choose>
-                  <dc:when test="$out = 'minfo-heights-diff'">
+                  <dc:comment> Inline datacage panels </dc:comment>
+                  <dc:when test="$out = 'minfo_diff_panel'">
                     <dc:call-macro name="minfo-heights-diff"/>
                   </dc:when>
-                  <dc:when test="$out = 'cross_section'">
+                  <dc:when test="$out = 'floodmap_dem_panel'">
+                    <dc:call-macro name="flood-map-dem"/>
+                  </dc:when>
+                  <dc:when test="$out = 'floodmap_hws_panel'">
+                    <hws>
+                      <dc:call-macro name="flood-map-hws-lines"/>
+                      <dc:call-macro name="flood-map-hws-points"/>
+                    </hws>
+                  </dc:when>
+                  <dc:when test="$out = 'winfo_diff_twin_panel'">
+                    <dc:if test="$current-state-id != 'state.winfo.uesk.wsp'">
+                      <dc:call-macro name="basedata_0"/>
+                      <dc:call-macro name="basedata_1_additionals"/>
+                      <dc:call-macro name="basedata_2_fixations"/>
+                      <dc:call-macro name="basedata_4_heightmarks-points"/>
+                      <dc:call-macro name="basedata_5_flood-protections"/>
+                    </dc:if>
+                  </dc:when>
+                  <dc:when test="$out = 'waterlevels_panel'">
                     <dc:call-macro name="basedata_0"/>
                     <dc:call-macro name="basedata_1_additionals"/>
                     <dc:call-macro name="basedata_2_fixations"/>
                     <dc:call-macro name="basedata_3_officials"/>
                     <dc:call-macro name="basedata_4_heightmarks-points"/>
-                    <dc:call-macro name="cross_sections"/>
                     <dc:call-macro name="basedata_5_flood-protections"/>
-                    <dc:call-macro name="hyks"/>
                   </dc:when>
+                  <dc:comment> Longitudinal sections </dc:comment>
                   <dc:when test="$out = 'longitudinal_section'">
                     <dc:call-macro name="longitudinal-section-prototype"/>
                   </dc:when>
@@ -155,45 +158,9 @@
                   <dc:when test="$out = 'discharge_longitudinal_section'">
                     <dc:call-macro name="longitudinal-section-prototype"/>
                   </dc:when>
-                  <dc:when test="$out = 'historical_discharge_wq'">
-                    <dc:call-macro name="discharge-curve-prototype"/>
-                    <dc:call-macro name="basedata_5_flood-protections"/>
-                    <dc:call-macro name="basedata_0"/>
-                    <dc:call-macro name="basedata_1_additionals"/>
-                    <dc:call-macro name="basedata_4_heightmarks-points"/>
-                    <computed_discharge_curve>
-                      <dc:call-macro name="mainvalues"/>
-                    </computed_discharge_curve>
-                  </dc:when>
-                  <dc:when test="$out = 'discharge_curve'">
-                    <dc:call-macro name="discharge-prototype"/>
-                    <computed_discharge_curve>
-                      <dc:call-macro name="mainvalues"/>
-                    </computed_discharge_curve>
-                  </dc:when>
-                  <dc:when test="$out = 'duration_curve'">
-                    <dc:call-macro name="mainvalues"/>
-                    <dc:call-macro name="basedata_2_fixations_relative_point"/>
-                    <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
-                    <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
-                  </dc:when>
-                  <dc:when test="$out = 'reference_curve'">
-                    <dc:call-macro name="mainvalues"/>
-                    <dc:call-macro name="annotations"/>
-                    <dc:call-macro name="basedata_1_additionals-relative_point"/>
-                    <dc:call-macro name="basedata_2_fixations_relative_point"/>
-                    <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
-                    <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
-                  </dc:when>
-                  <dc:when test="$out = 'fix_wq_curve'">
-                    <dc:call-macro name="discharge-prototype"/>
-                  </dc:when>
                   <dc:when test="$out = 'fix_longitudinal_section_curve'">
                     <dc:call-macro name="longitudinal-section-prototype"/>
                   </dc:when>
-                  <dc:when test="$out = 'map'">
-                    <dc:call-macro name="flood-map-complete"/>
-                  </dc:when>
                   <dc:when test="$out = 'flow_velocity'">
                     <dc:call-macro name="longitudinal-section-prototype"/>
                   </dc:when>
@@ -212,37 +179,25 @@
                   <dc:when test="$out = 'bed_difference_year'">
                     <dc:call-macro name="longitudinal-section-prototype"/>
                   </dc:when>
-                  <dc:when test="$out = 'floodmap'">
-                    <dc:choose>
-                      <dc:when test="dc:contains($parameters, 'dem')">
-                        <dc:call-macro name="flood-map-dem"/>
-                      </dc:when>
-                      <dc:when test="dc:contains($parameters, 'hws')">
-                        <hws>
-                          <dc:call-macro name="flood-map-hws-lines"/>
-                          <dc:call-macro name="flood-map-hws-points"/>
-                        </hws>
-                      </dc:when>
-                      <dc:otherwise>
-                        <dc:call-macro name="flood-map-complete"/>
-                      </dc:otherwise>
-                    </dc:choose>
+                  <dc:comment> Discharge curves </dc:comment>
+                  <dc:when test="$out = 'historical_discharge_wq'">
+                    <dc:call-macro name="discharge-curve-prototype"/>
+                    <dc:call-macro name="basedata_5_flood-protections"/>
+                    <dc:call-macro name="basedata_0"/>
+                    <dc:call-macro name="basedata_1_additionals"/>
+                    <dc:call-macro name="basedata_4_heightmarks-points"/>
+                    <computed_discharge_curve>
+                      <dc:call-macro name="mainvalues"/>
+                    </computed_discharge_curve>
                   </dc:when>
-                  <dc:when test="$out = 'floodmap-hws'">
-                    <dc:choose>
-                      <dc:when test="dc:contains($parameters, 'dem')">
-                        <dc:call-macro name="flood-map-dem"/>
-                      </dc:when>
-                      <dc:when test="dc:contains($parameters, 'hws')">
-                        <hws>
-                          <dc:call-macro name="flood-map-hws-lines"/>
-                          <dc:call-macro name="flood-map-hws-points"/>
-                        </hws>
-                      </dc:when>
-                      <dc:otherwise>
-                        <dc:call-macro name="flood-map-complete"/>
-                      </dc:otherwise>
-                    </dc:choose>
+                  <dc:when test="$out = 'discharge_curve'">
+                    <dc:call-macro name="discharge-prototype"/>
+                    <computed_discharge_curve>
+                      <dc:call-macro name="mainvalues"/>
+                    </computed_discharge_curve>
+                  </dc:when>
+                  <dc:when test="$out = 'fix_wq_curve'">
+                    <dc:call-macro name="discharge-prototype"/>
                   </dc:when>
                   <dc:when test="$out = 'computed_discharge_curve'">
                     <dc:call-macro name="discharge-curve-prototype"/>
@@ -253,34 +208,43 @@
                       <dc:call-macro name="mainvalues"/>
                     </computed_discharge_curve>
                   </dc:when>
-                  <dc:when test="$out = 'minfo-heights'">
-                    <dc:call-macro name="minfo-heights"/>
-                  </dc:when>
-                  <dc:when test="$out = 'minfo-heights-epoch'">
-                    <bedheights>
-                      <dc:call-macro name="bed-heights-epoch"/>
-                    </bedheights>
+                  <dc:when test="starts-with($out, 'sq_relation') or
+                                 $out = 'sq_overview'">
+                    <dc:call-macro name="sqrelations"/>
                   </dc:when>
-                  <dc:when test="$out = 'differenceable'">
-                    <dc:if test="$current-state-id != 'state.winfo.uesk.wsp'">
-                      <dc:call-macro name="basedata_0"/>
-                      <dc:call-macro name="basedata_1_additionals"/>
-                      <dc:call-macro name="basedata_2_fixations"/>
-                      <dc:call-macro name="basedata_4_heightmarks-points"/>
-                      <dc:call-macro name="basedata_5_flood-protections"/>
-                    </dc:if>
-                  </dc:when>
-                  <dc:when test="$out = 'waterlevels'">
+                  <dc:comment> Cross sections </dc:comment>
+                  <dc:when test="$out = 'cross_section'">
                     <dc:call-macro name="basedata_0"/>
                     <dc:call-macro name="basedata_1_additionals"/>
                     <dc:call-macro name="basedata_2_fixations"/>
                     <dc:call-macro name="basedata_3_officials"/>
                     <dc:call-macro name="basedata_4_heightmarks-points"/>
+                    <dc:call-macro name="cross_sections"/>
                     <dc:call-macro name="basedata_5_flood-protections"/>
+                    <dc:call-macro name="hyks"/>
                   </dc:when>
-                  <dc:when test="starts-with($out, 'sq_relation') or
-                                 $out = 'sq_overview'">
-                    <dc:call-macro name="sqrelations"/>
+                  <dc:comment> Duration curve </dc:comment>
+                  <dc:when test="$out = 'duration_curve'">
+                    <dc:call-macro name="mainvalues"/>
+                    <dc:call-macro name="basedata_2_fixations_relative_point"/>
+                    <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
+                    <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
+                  </dc:when>
+                  <dc:comment> Reference curve </dc:comment>
+                  <dc:when test="$out = 'reference_curve'">
+                    <dc:call-macro name="mainvalues"/>
+                    <dc:call-macro name="annotations"/>
+                    <dc:call-macro name="basedata_1_additionals-relative_point"/>
+                    <dc:call-macro name="basedata_2_fixations_relative_point"/>
+                    <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
+                    <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
+                  </dc:when>
+                  <dc:comment> Maps </dc:comment>
+                  <dc:when test="$out = 'map'">
+                    <dc:call-macro name="flood-map-complete"/>
+                  </dc:when>
+                  <dc:when test="$out = 'floodmap'">
+                    <dc:call-macro name="flood-map-complete"/>
                   </dc:when>
                 </dc:choose>
               </dc:iterate>
@@ -314,6 +278,24 @@
                 </dc:comment>
                 <dc:iterate var="out" container="artifact-outs">
                   <dc:choose>
+                    <dc:comment> Inline datacage panels </dc:comment>
+                    <dc:when test="$out = 'winfo_diff_twin_panel'">
+                      <dc:call-macro name="differences-fix"/>
+                      <dc:call-macro name="differences"/>
+                      <dc:comment comment="Candidate for:">
+                        <dc:call-macro name="longitudinal-section-user-prototype"/>
+                      </dc:comment>
+                    </dc:when>
+                    <dc:when test="$out = 'waterlevels_panel'">
+                      <dc:call-macro name="waterlevels-fix"/>
+                      <dc:comment comment="Candidate for:">
+                        <dc:call-macro name="longitudinal-section-user-prototype"/>
+                      </dc:comment>
+                    </dc:when>
+                    <dc:when test="$out = 'floodmap_hws_panel'">
+                      <dc:call-macro name="floodmap-hws-user"/>
+                    </dc:when>
+                    <dc:comment> Longitudinal sections </dc:comment>
                     <dc:when test="$out = 'longitudinal_section'">
                       <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
@@ -323,59 +305,12 @@
                     <dc:when test="$out = 'w_differences'">
                       <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
-                    <dc:when test="$out = 'computed_discharge_curve'">
-                      <dc:call-macro name="computed-discharge-curve"/>
-                      <dc:call-macro name="fix-wq-curve"/>
-                      <dc:call-macro name="discharge-curve"/>
-                      <dc:call-macro name="extreme-wq-curve"/>
-                    </dc:when>
-                    <dc:when test="$out = 'fix_deltawt_curve'">
-                      <dc:call-macro name="delta-wt"/>
-                    </dc:when>
-                    <dc:when test="$out = 'reference_curve'">
-                      <dc:call-macro name="reference-curves"/>
-                    </dc:when>
-                    <dc:when test="$out = 'cross_section'">
-                      <dc:call-macro name="waterlevels"/>
-                    </dc:when>
                     <dc:when test="$out = 'fix_longitudinal_section_curve'">
                       <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
-                    <dc:when test="$out = 'fix_derivate_curve'">
-                      <dc:call-macro name="fix-derivate-curve"/>
-                    </dc:when>
-                    <dc:when test="$out = 'fix_wq_curve'">
-                      <dc:call-macro name="fix-wq-curve"/>
-                      <dc:call-macro name="waterlevels-fix"/>
-                    </dc:when>
-                    <dc:when test="$out = 'duration_curve'">
-                      <dc:call-macro name="duration-curve"/>
-                    </dc:when>
-                    <dc:when test="$out = 'differenceable'">
-                      <dc:call-macro name="differenceable-fix"/>
-                      <dc:call-macro name="differences"/>
-                      <dc:comment comment="Candidate for:">
-                        <dc:call-macro name="longitudinal-section-user-prototype"/>
-                      </dc:comment>
-                    </dc:when>
-                    <dc:when test="$out = 'waterlevels'">
-                      <dc:call-macro name="waterlevels-fix"/>
-                      <dc:comment comment="Candidate for:">
-                        <dc:call-macro name="longitudinal-section-user-prototype"/>
-                      </dc:comment>
-                    </dc:when>
-                    <dc:when test="$out = 'floodmap'">
-                      <dc:call-macro name="flood-map"/>
-                    </dc:when>
-                    <dc:when test="$out = 'map'">
-                      <dc:call-macro name="flood-map"/>
-                    </dc:when>
                     <dc:when test="$out = 'bedheight_middle'">
                       <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
-                    <dc:when test="$out = 'floodmap-hws'">
-                      <dc:call-macro name="floodmap-hws-user"/>
-                    </dc:when>
                     <dc:when test="$out = 'flow_velocity'">
                       <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
@@ -391,8 +326,19 @@
                     <dc:when test="$out = 'bed_difference_height_year'">
                       <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
-                    <dc:when test="$out = 'historical_discharge'">
-                      <dc:call-macro name="historical-discharge-user"/>
+                    <dc:comment> Discharge curves </dc:comment>
+                    <dc:when test="$out = 'computed_discharge_curve'">
+                      <dc:call-macro name="computed-discharge-curve"/>
+                      <dc:call-macro name="fix-wq-curve"/>
+                      <dc:call-macro name="discharge-curve"/>
+                      <dc:call-macro name="extreme-wq-curve"/>
+                    </dc:when>
+                    <dc:when test="$out = 'fix_derivate_curve'">
+                      <dc:call-macro name="fix-derivate-curve"/>
+                    </dc:when>
+                    <dc:when test="$out = 'fix_wq_curve'">
+                      <dc:call-macro name="fix-wq-curve"/>
+                      <dc:call-macro name="waterlevels-fix"/>
                     </dc:when>
                     <dc:when test="$out = 'historical_discharge_wq'">
                       <dc:call-macro name="historical-discharge-wq-user"/>
@@ -401,6 +347,32 @@
                                  $out = 'sq_overview'">
                       <dc:call-macro name="sqrelations_user"/>
                     </dc:when>
+                    <dc:comment> Time series </dc:comment>
+                    <dc:when test="$out = 'fix_deltawt_curve'">
+                      <dc:call-macro name="delta-wt"/>
+                    </dc:when>
+                    <dc:when test="$out = 'historical_discharge'">
+                      <dc:call-macro name="historical-discharge-user"/>
+                    </dc:when>
+                    <dc:comment> Cross sections </dc:comment>
+                    <dc:when test="$out = 'cross_section'">
+                      <dc:call-macro name="waterlevels"/>
+                    </dc:when>
+                    <dc:comment> Duration curve </dc:comment>
+                    <dc:when test="$out = 'duration_curve'">
+                      <dc:call-macro name="duration-curve"/>
+                    </dc:when>
+                    <dc:comment> Reference curve </dc:comment>
+                    <dc:when test="$out = 'reference_curve'">
+                      <dc:call-macro name="reference-curves"/>
+                    </dc:when>
+                    <dc:comment> Maps </dc:comment>
+                    <dc:when test="$out = 'floodmap'">
+                      <dc:call-macro name="flood-map"/>
+                    </dc:when>
+                    <dc:when test="$out = 'map'">
+                      <dc:call-macro name="flood-map"/>
+                    </dc:when>
                   </dc:choose>
                 </dc:iterate>
               </dc:otherwise>
@@ -859,13 +831,7 @@
     </dc:macro>
 
     <dc:comment comment="For building differences." />
-    <dc:macro name="differenceable-fix">
-      <dc:comment>
-        No diffs between beddiffs and others, for now.
-        <beddifferences>
-           <dc:call-macro name="bedheight_differences"/>
-        </beddifferences>
-      </dc:comment>
+    <dc:macro name="differences-fix">
       <dc:comment comment="Vollmer curves need own factory"/>
       <dc:filter expr="$a_state = 'state.fix.vollmer.compute' and $facet_name = 'longitudinal_section.w'">
         <dc:if test="dc:has-result()">
@@ -1441,49 +1407,59 @@
     </dc:macro>
 
     <dc:macro name="loads">
-     <dc:if test="dc:has-result()">
-       <dc:group expr="$fraction">
-         <dc:variable name="fraction_name" expr="concat('${', dc:group-key(), '}')"/>
-         <fraction description="{$fraction_name}">
-           <dc:for-each>
-             <dc:choose>
-               <dc:when test="string-length(dc:get('endyear')) = 0">
-                 <dc:variable name="timespan" type="string"
-                              expr="dc:date-format('yyyy', $startyear)"/>
-               </dc:when>
-               <dc:otherwise>
-                 <dc:variable name="timespan" type="string"
-                              expr="concat(dc:date-format('yyyy', $startyear),
-                                    '-', dc:date-format('yyyy', $endyear))"/>
-               </dc:otherwise>
-             </dc:choose>
-             <dc:if test="$kind = 'official'">
-               <dc:variable name="info" type="string"
-                            expr="concat('Amtliche Epoche&lt;BR&gt;', dc:get('info'))"/>
-             </dc:if>
-             <dc:macro-body/>
-           </dc:for-each>
-         </fraction>
-       </dc:group>
-     </dc:if>
+      <dc:if test="dc:has-result()">
+        <dc:group expr="concat('SQ ', dc:date-format('yyyy', $sqstart), '-',
+                        dc:date-format('yyyy', $sqstop))">
+          <sq_time description="{dc:group-key()}">
+            <dc:group expr="$fraction">
+              <dc:variable name="fraction_name"
+                           expr="concat('${', dc:group-key(), '}')"/>
+              <fraction description="{$fraction_name}">
+                <dc:for-each>
+                  <dc:choose>
+                    <dc:when test="string-length(dc:get('endyear')) = 0">
+                      <dc:variable name="timespan" type="string"
+                                   expr="dc:date-format('yyyy', $startyear)"/>
+                    </dc:when>
+                    <dc:otherwise>
+                      <dc:variable name="timespan" type="string"
+                                   expr="concat(dc:date-format('yyyy',
+                                         $startyear), '-',
+                                         dc:date-format('yyyy', $endyear))"/>
+                    </dc:otherwise>
+                  </dc:choose>
+                  <dc:if test="$kind = 'official'">
+                    <dc:variable name="info" type="string"
+                                 expr="concat('Amtliche Epoche&lt;BR&gt;',
+                                       dc:get('info'))"/>
+                  </dc:if>
+                  <dc:macro-body/>
+                </dc:for-each>
+              </fraction>
+            </dc:group>
+          </sq_time>
+        </dc:group>
+      </dc:if>
     </dc:macro>
 
     <dc:macro name="sedimentloads-filter">
-      <dc:group expr="concat('SQ ', dc:date-format('yyyy', $sqstart), '-',
-                      dc:date-format('yyyy', $sqstop))">
-        <sq_time description="{dc:group-key()}">
-          <years>
-            <dc:filter expr="string-length(dc:get('endyear')) = 0" >
-              <dc:macro-body/>
-            </dc:filter>
-          </years>
-          <epochs>
-            <dc:filter expr="string-length(dc:get('endyear')) &gt; 0" >
-              <dc:macro-body/>
-            </dc:filter>
-          </epochs>
-        </sq_time>
-      </dc:group>
+      <years>
+        <dc:filter expr="string-length(dc:get('endyear')) = 0 and
+                         $kind != 'official'" >
+          <dc:macro-body/>
+        </dc:filter>
+      </years>
+      <epochs>
+        <dc:filter expr="string-length(dc:get('endyear')) &gt; 0 and
+                         $kind != 'official'" >
+          <dc:macro-body/>
+        </dc:filter>
+      </epochs>
+      <off_epochs>
+        <dc:filter expr="$kind = 'official'" >
+          <dc:macro-body/>
+        </dc:filter>
+      </off_epochs>
     </dc:macro>
 
     <dc:macro name="sedimentloads">