--- a/artifacts/doc/conf/meta-data.xml	Wed Oct 23 11:22:47 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Wed Oct 23 11:33:31 2013 +0200
@@ -1273,8 +1273,8 @@
       <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="basedata_3_officials"/>
       <dc:call-macro name="basedata_5_flood-protections"/>
       <dc:call-macro name="annotations_per_type"/>
       <minfo>
@@ -1763,8 +1763,8 @@
     <dc:macro name="flow_velocity_models">
       <dc:context>
         <dc:statement>
-          SELECT fvm.id          AS fvmid,
-                 fvm.description AS fvmd,
+          SELECT fvm.id             AS fvmid,
+                 fvm.description    AS fvmd,
                  dz.upper_discharge AS upperQ,
                  dz.lower_discharge AS lowerQ
           FROM flow_velocity_model fvm