--- a/artifacts/doc/conf/meta-data.xml	Fri Apr 27 17:35:12 2018 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Fri Apr 27 17:41:59 2018 +0200
@@ -1628,8 +1628,14 @@
         </bed_heights_minmax>
         
         <sinfo_predefined_tkh>
-          <dc:call-macro name="sinfo_predefined_tkh"/>
+          <dc:call-macro name="sinfo_predefined_tkh-berechnung"/>
+          <dc:call-macro name="sinfo_predefined_tkh-messung"/>
         </sinfo_predefined_tkh>
+        
+        <sinfo_predefined_depthevol>
+          <dc:call-macro name="sinfo_predefined_depthevol-aktuell"/>
+          <dc:call-macro name="sinfo_predefined_depthevol-etappe"/>
+        </sinfo_predefined_depthevol>
       </sinfo>
     </dc:macro>
 
@@ -3464,7 +3470,21 @@
       </dc:filter>
     </dc:macro>
 
-        <!-- tkh imported from CSV-files for S-INFO -->
+    <!-- tkh imported from CSV-files for S-INFO -->
+    <dc:macro name="sinfo_predefined_tkh-berechnung">
+      <predefined_tkh_berechnung>
+        <dc:variable name="tkh_groupname" expr="'berechnung'"/>
+        <dc:call-macro name="sinfo_predefined_tkh"/>
+      </predefined_tkh_berechnung>
+    </dc:macro>
+    
+    <dc:macro name="sinfo_predefined_tkh-messung">
+      <predefined_tkh_messung>
+        <dc:variable name="tkh_groupname" expr="'messung'"/>
+        <dc:call-macro name="sinfo_predefined_tkh"/>
+      </predefined_tkh_messung>
+    </dc:macro>
+    
     <dc:macro name="sinfo_predefined_tkh">
       <dc:context>
         <dc:statement>
@@ -3473,7 +3493,8 @@
             MIN(t.filename) || '&lt;br /&gt;' || MIN(t.sounding_info) || '&lt;br /&gt;' || MIN(t.evaluation_by) AS info
           FROM tkh_column tc INNER JOIN tkh t ON tc.tkh_id=t.id
             INNER JOIN tkh_values tv ON tc.id=tv.tkh_column_id
-          WHERE t.river_id=${river_id}
+          WHERE (t.river_id=${river_id})
+          AND (lower(t.groupname)=${tkh_groupname})
           GROUP BY tc.tkh_id, tc.id
           ORDER BY tc.id
         </dc:statement>
@@ -3489,5 +3510,40 @@
       </dc:context>
     </dc:macro>
 
+    <!-- depth_evolution imported from CSV-files for S-INFO -->
+    <dc:macro name="sinfo_predefined_depthevol-aktuell">
+      <predefined_depthevol_aktuell>
+        <dc:variable name="depthevol_groupname" expr="'aktuell'"/>
+        <dc:call-macro name="sinfo_predefined_depthevol"/>
+      </predefined_depthevol_aktuell>
+    </dc:macro>
+    
+    <dc:macro name="sinfo_predefined_depthevol-etappe">
+      <predefined_depthevol_etappe>
+        <dc:variable name="depthevol_groupname" expr="'etappe'"/>
+        <dc:call-macro name="sinfo_predefined_depthevol"/>
+      </predefined_depthevol_etappe>
+    </dc:macro>
+    
+    <dc:macro name="sinfo_predefined_depthevol">
+      <dc:context>
+        <dc:statement>
+          SELECT s.id AS depthevol_id, s.filename AS depthevol_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max,
+            s.filename || '&lt;br /&gt;'
+            || MIN(s.start_year) || ' - ' || MIN(s.reference_year) || '&lt;br /&gt;'
+            || MIN(s.old_sounding) || ' - ' || MIN(s.curr_sounding) || '&lt;br /&gt;'
+            || MIN(s.old_glw) || ' - ' || MIN(s.curr_glw) AS info
+          FROM depth_evolution s INNER JOIN depth_evolution_values v ON s.id=v.depth_evolution_id
+          WHERE (s.river_id=${river_id})
+          AND (lower(s.groupname)=${depthevol_groupname})
+          GROUP BY s.id
+          ORDER BY s.id
+        </dc:statement>
+        <dc:for-each>
+          <depth_evol name="{$depthevol_name}" ids="depthevolx-{$depthevol_id}-{$depthevol_name}" factory="depthevolxf" target_out="{$out}" info="{$depthevol_name}&lt;br /&gt;[km {$km_min} - {$km_max}]"/>
+        </dc:for-each>
+      </dc:context>
+    </dc:macro>
+
   </datacage>
 </dc:template>
\ No newline at end of file