--- a/artifacts/doc/conf/meta-data.xml	Thu May 23 11:22:34 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Thu May 23 11:23:54 2013 +0200
@@ -262,102 +262,104 @@
     </dc:macro>
 
     <dc:macro name="generate-user-content">
-      <dc:call-macro name="km-filtered-userdata">
-        <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="officiallines_user"/>
-            </dc:when>
-            <dc:when test="$out = 'discharge_longitudinal_section'">
-              <dc:call-macro name="longitudinal"/>
-              <dc:call-macro name="differences"/>
-            </dc:when>
-            <dc:when test="$out = 'w_differences'">
-              <dc:call-macro name="longitudinal"/>
-              <dc:call-macro name="differences"/>
-            </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 = 'computed_discharge_curve'">
-              <dc:call-macro name="computed-discharge-curve"/>
-            </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"/>
-            </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:when>
-            <dc:when test="$out = 'duration_curve'">
-              <dc:call-macro name="duration-curve"/>
-            </dc:when>
-            <dc:when test="$out = 'waterlevels'">
-              <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:call-macro name="waterlevels-fix"/>
-            </dc:when>
-            <dc:when test="$out = 'fix_wq_curve'">
-              <dc:call-macro name="waterlevels-fix"/>
-            </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="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'">
-              <dc:call-macro name="bedquality-bed"/>
-              <dc:call-macro name="bedquality-load"/>
-            </dc:when>
-            <dc:when test="$out = 'bed_longitudinal_section'">
-              <dc:call-macro name="bedquality-bed"/>
-              <dc:call-macro name="bedquality-load"/>
-              <dc:call-macro name="bedquality-density"/>
-              <dc:call-macro name="bedquality-porosity"/>
-            </dc:when>
-            <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'">
-              <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'">
-              <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:choose>
-        </dc:iterate>
+      <dc:call-macro name="user-range">
+        <dc:call-macro name="km-filtered-userdata">
+          <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="officiallines_user"/>
+              </dc:when>
+              <dc:when test="$out = 'discharge_longitudinal_section'">
+                <dc:call-macro name="longitudinal"/>
+                <dc:call-macro name="differences"/>
+              </dc:when>
+              <dc:when test="$out = 'w_differences'">
+                <dc:call-macro name="longitudinal"/>
+                <dc:call-macro name="differences"/>
+              </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 = 'computed_discharge_curve'">
+                <dc:call-macro name="computed-discharge-curve"/>
+              </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"/>
+              </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:when>
+              <dc:when test="$out = 'duration_curve'">
+                <dc:call-macro name="duration-curve"/>
+              </dc:when>
+              <dc:when test="$out = 'waterlevels'">
+                <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:call-macro name="waterlevels-fix"/>
+              </dc:when>
+              <dc:when test="$out = 'fix_wq_curve'">
+                <dc:call-macro name="waterlevels-fix"/>
+              </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="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'">
+                <dc:call-macro name="bedquality-bed"/>
+                <dc:call-macro name="bedquality-load"/>
+              </dc:when>
+              <dc:when test="$out = 'bed_longitudinal_section'">
+                <dc:call-macro name="bedquality-bed"/>
+                <dc:call-macro name="bedquality-load"/>
+                <dc:call-macro name="bedquality-density"/>
+                <dc:call-macro name="bedquality-porosity"/>
+              </dc:when>
+              <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'">
+                <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'">
+                <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:choose>
+          </dc:iterate>
+      </dc:call-macro>
       </dc:call-macro>
     </dc:macro>
 
@@ -2623,7 +2625,8 @@
     </dc:macro>
 
     <dc:macro name="km-filtered-userdata">
-      <dc:context connection="user">
+        <dc:context connection="user">
+        <dc:comment>Select collections and masterartifacts.</dc:comment>
         <dc:statement>
           SELECT c.name                     AS collection_name,
                  ma.id                      AS a_id,