--- a/artifacts/doc/conf/meta-data.xml	Fri Sep 28 10:16:12 2018 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Fri Sep 28 13:44:12 2018 +0200
@@ -256,7 +256,7 @@
                     <dc:call-macro name="cross_sections" />
                     <dc:call-macro name="basedata_5_flood-protections" />
                     <dc:call-macro name="hyks" />
-                    <dc:call-macro name="predefined_vegetation_zones_cs" />
+                    <dc:call-macro name="predefined_vegetation_zones" />
                   </dc:when>
                   <dc:comment> Duration curve </dc:comment>
                   <dc:when test="$out = 'duration_curve'">
@@ -341,8 +341,7 @@
                     <dc:call-macro name="longitudinal-section-prototype" />
                   </dc:when>
                   <dc:when test="$out = 'uinfo.inundation_duration.vegzoneselect'">
-                    <dc:variable name="vegzonedata" expr="dc:defaultvegetationzone($river)"></dc:variable>
-                    <defaultVegetationZone factory="dummy" target_out="{$out}" data="{$vegzonedata}"></defaultVegetationZone>
+                    <dc:call-macro name="predefined_vegetation_zones" />
                   </dc:when>
                   <dc:when test="$out = 'bundu_wspl_longitudinal_section'">
                     <dc:call-macro name="longitudinal-section-prototype" />
@@ -1331,14 +1330,15 @@
       </hyks>
     </dc:macro>
 
- <!-- Default Vegetation Zones -->
-    <dc:macro name="predefined_vegetation_zones_cs">
-      <U-INFO>
-        <vegetation_zones> 
-          <dc:variable name="vegzonedata" expr="dc:defaultvegetationzone($river)"></dc:variable>
-            <defaultVegetationZone factory="dummy" target_out="{$out}" data="{$vegzonedata}"/>         
+    <!-- Default Vegetation Zones -->
+    <dc:macro name="predefined_vegetation_zones">
+      <uinfo>
+        <vegetation_zones>
+          <dc:variable name="vegzonedata" expr="dc:defaultvegetationzone($river)"/>
+
+          <defaultVegetationZone factory="predefined_vegetation_zonesf" target_out="{$out}" ids="{$vegzonedata}"/>         
         </vegetation_zones>
-      </U-INFO>
+      </uinfo>
     </dc:macro>
 
     <!-- wst-data -->
@@ -3779,10 +3779,7 @@
           <vegetation_zones>
             <dc:for-each>
               <dc:variable name="vegzonedata" expr="dc:data_from_artifact($a_gid,'vegzones')" />
-              <dc:variable name="vegzonedatalabel" expr="dc:get('ld_from')" />
-              <dc:variable name="label_temp" type="string" expr="dc:coalesce($collection_name, dc:toString($collection_gid))" />
-              <dc:variable name="fromkm" type="number" expr="dc:fromValue(dc:get('ld_mode'), dc:get('ld_locations'), dc:get('ld_from'))" />
-              <dc:variable name="tokm" type="number" expr="dc:fromValue(dc:get('ld_mode'), dc:get('ld_locations'), dc:get('ld_to'))" />
+              <dc:variable name="label_temp" type="string" expr="concat(dc:get('ld_f'), ' km - ', dc:get('ld_t'), ' km')" />
 
               <dc:element name="${facet_name}">
                 <dc:attribute name="factory" value="uinfo" />
@@ -3793,8 +3790,6 @@
                 <dc:attribute name="ids" value="${facet_num}" />
                 <!-- veg zones string as attribute -->
                 <dc:attribute name="data" value="${vegzonedata}" />
-                <dc:attribute name="from_km" value="${fromkm}" />
-                <dc:attribute name="to_km" value="${tokm}" /> 
               </dc:element>
             </dc:for-each>
           </vegetation_zones>