From 4384a98017bf1fb851383b2299a80ed575deaf4c Mon Sep 17 00:00:00 2001
From: Etienne Trimaille <gustrimaille@yahoo.fr>
Date: Mon, 26 Aug 2024 14:02:36 +0200
Subject: [PATCH] Upgrade test project to 3.22

---
 .../projects/pg_metadata_administration.qgs   | 3617 +++++++++--------
 pg_metadata/test/test_sql.py                  |    2 +-
 2 files changed, 1936 insertions(+), 1683 deletions(-)

diff --git a/pg_metadata/resources/projects/pg_metadata_administration.qgs b/pg_metadata/resources/projects/pg_metadata_administration.qgs
index 4e046c3b..ef717da6 100644
--- a/pg_metadata/resources/projects/pg_metadata_administration.qgs
+++ b/pg_metadata/resources/projects/pg_metadata_administration.qgs
@@ -1,13 +1,12 @@
-<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis version="3.16.15-Hannover" projectname="">
-  <homePath path=""/>
+<qgis projectname="" version="3.22.16-Białowieża">
+  <homePath path=""></homePath>
   <title></title>
-  <autotransaction active="0"/>
-  <evaluateDefaultValues active="0"/>
-  <trust active="0"/>
+  <autotransaction active="0"></autotransaction>
+  <evaluateDefaultValues active="0"></evaluateDefaultValues>
+  <trust active="0"></trust>
   <projectCrs>
     <spatialrefsys>
-      <wkt>GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+      <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
       <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
       <srsid>3452</srsid>
       <srid>4326</srid>
@@ -19,96 +18,135 @@
     </spatialrefsys>
   </projectCrs>
   <layer-tree-group>
-    <customproperties/>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="Configuration">
-      <customproperties/>
-      <layer-tree-layer expanded="1" patch_size="0,0" checked="Qt::Checked" name="Contact" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;contact&quot;" legend_exp="" legend_split_behavior="0" providerKey="postgres" id="contact_640d326a_25a7_4b9c_8878_42d1201a8198">
+    <customproperties>
+      <Option></Option>
+    </customproperties>
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Configuration">
+      <customproperties>
+        <Option></Option>
+      </customproperties>
+      <layer-tree-layer checked="Qt::Checked" expanded="1" id="contact_640d326a_25a7_4b9c_8878_42d1201a8198" legend_exp="" legend_split_behavior="0" name="Contact" patch_size="0,0" providerKey="postgres" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;contact&quot;">
         <customproperties>
-          <property value="0" key="showFeatureCount"/>
+          <Option type="Map">
+            <Option name="showFeatureCount" type="QString" value="0"></Option>
+          </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" patch_size="0,0" checked="Qt::Checked" name="Dataset &lt;-> Contact" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;dataset_contact&quot;" legend_exp="" legend_split_behavior="0" providerKey="postgres" id="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675">
-        <customproperties/>
+      <layer-tree-layer checked="Qt::Checked" expanded="1" id="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675" legend_exp="" legend_split_behavior="0" name="Dataset &lt;-> Contact" patch_size="0,0" providerKey="postgres" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;dataset_contact&quot;">
+        <customproperties>
+          <Option></Option>
+        </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" patch_size="0,0" checked="Qt::Checked" name="Dataset" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true srid=4326 type=Polygon checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;dataset&quot; (geom)" legend_exp="" legend_split_behavior="0" providerKey="postgres" id="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" id="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd" legend_exp="" legend_split_behavior="0" name="Dataset" patch_size="0,0" providerKey="postgres" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true srid=4326 type=Polygon checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;dataset&quot; (geom)">
         <customproperties>
-          <property value="0" key="showFeatureCount"/>
+          <Option type="Map">
+            <Option name="showFeatureCount" type="QString" value="0"></Option>
+          </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" patch_size="0,0" checked="Qt::Checked" name="Link" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;link&quot;" legend_exp="" legend_split_behavior="0" providerKey="postgres" id="link_6157b282_9882_44f3_b6a1_c133f5595d2a">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" id="link_6157b282_9882_44f3_b6a1_c133f5595d2a" legend_exp="" legend_split_behavior="0" name="Link" patch_size="0,0" providerKey="postgres" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;link&quot;">
         <customproperties>
-          <property value="0" key="showFeatureCount"/>
+          <Option type="Map">
+            <Option name="showFeatureCount" type="QString" value="0"></Option>
+          </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" patch_size="0,0" checked="Qt::Checked" name="HTML templates" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;html_template&quot;" legend_exp="" legend_split_behavior="0" providerKey="postgres" id="html_template_e9cca240_a640_4a7c_a9d0_a181beb9797e">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" id="html_template_e9cca240_a640_4a7c_a9d0_a181beb9797e" legend_exp="" legend_split_behavior="0" name="HTML templates" patch_size="0,0" providerKey="postgres" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;html_template&quot;">
         <customproperties>
-          <property value="0" key="showFeatureCount"/>
+          <Option type="Map">
+            <Option name="showFeatureCount" type="QString" value="0"></Option>
+          </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" patch_size="0,0" checked="Qt::Checked" name="Glossary" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;glossary&quot;" legend_exp="" legend_split_behavior="0" providerKey="postgres" id="glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" id="glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab" legend_exp="" legend_split_behavior="0" name="Glossary" patch_size="0,0" providerKey="postgres" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;glossary&quot;">
         <customproperties>
-          <property value="0" key="showFeatureCount"/>
+          <Option type="Map">
+            <Option name="showFeatureCount" type="QString" value="0"></Option>
+          </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" patch_size="0,0" checked="Qt::Checked" name="Theme" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;theme&quot;" legend_exp="" legend_split_behavior="0" providerKey="postgres" id="theme_3d260140_3e41_4dbe_8e79_813f3f5d3d50">
-        <customproperties/>
+      <layer-tree-layer checked="Qt::Checked" expanded="1" id="theme_3d260140_3e41_4dbe_8e79_813f3f5d3d50" legend_exp="" legend_split_behavior="0" name="Theme" patch_size="0,0" providerKey="postgres" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;theme&quot;">
+        <customproperties>
+          <Option></Option>
+        </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="Information">
-      <customproperties/>
-      <layer-tree-layer expanded="1" patch_size="0,0" checked="Qt::Checked" name="Table list" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;v_table_list&quot;" legend_exp="" legend_split_behavior="0" providerKey="postgres" id="v_table_list_48c78797_5376_47b8_90e0_8c4f8236fa44">
-        <customproperties/>
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Information">
+      <customproperties>
+        <Option></Option>
+      </customproperties>
+      <layer-tree-layer checked="Qt::Checked" expanded="1" id="v_table_list_48c78797_5376_47b8_90e0_8c4f8236fa44" legend_exp="" legend_split_behavior="0" name="Table list" patch_size="0,0" providerKey="postgres" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;v_table_list&quot;">
+        <customproperties>
+          <Option></Option>
+        </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" patch_size="0,0" checked="Qt::Checked" name="Schema list" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;v_schema_list&quot;" legend_exp="" legend_split_behavior="0" providerKey="postgres" id="v_schema_list_140f3a29_ae94_480c_932c_fb47bdad292c">
-        <customproperties/>
+      <layer-tree-layer checked="Qt::Checked" expanded="1" id="v_schema_list_140f3a29_ae94_480c_932c_fb47bdad292c" legend_exp="" legend_split_behavior="0" name="Schema list" patch_size="0,0" providerKey="postgres" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;v_schema_list&quot;">
+        <customproperties>
+          <Option></Option>
+        </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" patch_size="0,0" checked="Qt::Checked" name="Valid metadata" source="service='pgmetadata' sslmode=disable key='schema_name' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;v_valid_dataset&quot;" legend_exp="" legend_split_behavior="0" providerKey="postgres" id="v_valid_dataset_4e46ef23_a5aa_441f_b21a_92bb573cbdfd">
-        <customproperties/>
+      <layer-tree-layer checked="Qt::Checked" expanded="1" id="v_valid_dataset_4e46ef23_a5aa_441f_b21a_92bb573cbdfd" legend_exp="" legend_split_behavior="0" name="Valid metadata" patch_size="0,0" providerKey="postgres" source="service='pgmetadata' sslmode=disable key='schema_name' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;v_valid_dataset&quot;">
+        <customproperties>
+          <Option></Option>
+        </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" patch_size="0,0" checked="Qt::Checked" name="Table comments" source="service='pgmetadata' sslmode=disable key='table_schema' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;v_table_comment_from_metadata&quot;" legend_exp="" legend_split_behavior="0" providerKey="postgres" id="v_table_comment_from_metadata_d6be195f_86d0_4ef6_af4d_d1fef8a4b7f7">
-        <customproperties/>
+      <layer-tree-layer checked="Qt::Checked" expanded="1" id="v_table_comment_from_metadata_d6be195f_86d0_4ef6_af4d_d1fef8a4b7f7" legend_exp="" legend_split_behavior="0" name="Table comments" patch_size="0,0" providerKey="postgres" source="service='pgmetadata' sslmode=disable key='table_schema' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;v_table_comment_from_metadata&quot;">
+        <customproperties>
+          <Option></Option>
+        </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="Information warnings">
-      <customproperties/>
-      <layer-tree-layer expanded="1" patch_size="0,0" checked="Qt::Checked" name="Orphan tables" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;v_orphan_tables&quot;" legend_exp="" legend_split_behavior="0" providerKey="postgres" id="v_orphan_tables_33b5eba9_96d1_442a_a32e_90a10c6fd2e5">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Information warnings">
+      <customproperties>
+        <Option></Option>
+      </customproperties>
+      <layer-tree-layer checked="Qt::Checked" expanded="1" id="v_orphan_tables_33b5eba9_96d1_442a_a32e_90a10c6fd2e5" legend_exp="" legend_split_behavior="0" name="Orphan tables" patch_size="0,0" providerKey="postgres" source="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;v_orphan_tables&quot;">
         <customproperties>
-          <property value="0" key="showFeatureCount"/>
+          <Option type="Map">
+            <Option name="showFeatureCount" type="QString" value="0"></Option>
+          </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer expanded="1" patch_size="0,0" checked="Qt::Checked" name="Orphan metadata" source="service='pgmetadata' sslmode=disable key='schema_name' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;v_orphan_dataset_items&quot;" legend_exp="" legend_split_behavior="0" providerKey="postgres" id="v_orphan_dataset_items_0fbfb83f_0c98_4391_bf51_8b5d8a362a73">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" id="v_orphan_dataset_items_0fbfb83f_0c98_4391_bf51_8b5d8a362a73" legend_exp="" legend_split_behavior="0" name="Orphan metadata" patch_size="0,0" providerKey="postgres" source="service='pgmetadata' sslmode=disable key='schema_name' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;v_orphan_dataset_items&quot;">
         <customproperties>
-          <property value="0" key="showFeatureCount"/>
+          <Option type="Map">
+            <Option name="showFeatureCount" type="QString" value="0"></Option>
+          </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" name="Advanced">
-      <customproperties/>
-      <layer-tree-layer expanded="1" patch_size="0,0" checked="Qt::Checked" name="Locales" source="service='pgmetadata' sslmode=disable key='locale' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;v_locales&quot;" legend_exp="" legend_split_behavior="0" providerKey="postgres" id="v_locales_f4efa77e_8eb0_4d5a_809c_d479ae6cc850">
-        <customproperties/>
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Advanced">
+      <customproperties>
+        <Option></Option>
+      </customproperties>
+      <layer-tree-layer checked="Qt::Checked" expanded="1" id="v_locales_f4efa77e_8eb0_4d5a_809c_d479ae6cc850" legend_exp="" legend_split_behavior="0" name="Locales" patch_size="0,0" providerKey="postgres" source="service='pgmetadata' sslmode=disable key='locale' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;v_locales&quot;">
+        <customproperties>
+          <Option></Option>
+        </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
     <custom-order enabled="0">
       <item>dataset_00c9da4d_d717_48cc_a848_0d4544b019fd</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings enabled="0" tolerance="0" type="1" scaleDependencyMode="0" maxScale="0" unit="2" intersection-snapping="0" self-snapping="0" mode="2" minScale="0">
+  <snapping-settings enabled="0" intersection-snapping="0" maxScale="0" minScale="0" mode="2" scaleDependencyMode="0" self-snapping="0" tolerance="0" type="1" unit="2">
     <individual-layer-settings>
-      <layer-setting enabled="0" tolerance="0" type="1" maxScale="0" units="2" id="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd" minScale="0"/>
+      <layer-setting enabled="0" id="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd" maxScale="0" minScale="0" tolerance="0" type="1" units="2"></layer-setting>
     </individual-layer-settings>
   </snapping-settings>
   <relations>
-    <relation name="dataset_contact_fk_id_contact_fkey" strength="Association" referencingLayer="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675" referencedLayer="contact_640d326a_25a7_4b9c_8878_42d1201a8198" id="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675_fk_id_contact_contact_640d326a_25a7_4b9c_8878_42d1201a8198_id">
-      <fieldRef referencedField="id" referencingField="fk_id_contact"/>
+    <relation id="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675_fk_id_contact_contact_640d326a_25a7_4b9c_8878_42d1201a8198_id" name="dataset_contact_fk_id_contact_fkey" referencedLayer="contact_640d326a_25a7_4b9c_8878_42d1201a8198" referencingLayer="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675" strength="Association">
+      <fieldRef referencedField="id" referencingField="fk_id_contact"></fieldRef>
     </relation>
-    <relation name="dataset_contact_fk_id_dataset_fkey" strength="Association" referencingLayer="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675" referencedLayer="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd" id="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id">
-      <fieldRef referencedField="id" referencingField="fk_id_dataset"/>
+    <relation id="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id" name="dataset_contact_fk_id_dataset_fkey" referencedLayer="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd" referencingLayer="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675" strength="Association">
+      <fieldRef referencedField="id" referencingField="fk_id_dataset"></fieldRef>
     </relation>
-    <relation name="link_fk_id_dataset_fkey" strength="Association" referencingLayer="link_6157b282_9882_44f3_b6a1_c133f5595d2a" referencedLayer="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd" id="link_6157b282_9882_44f3_b6a1_c133f5595d2a_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id">
-      <fieldRef referencedField="id" referencingField="fk_id_dataset"/>
+    <relation id="link_6157b282_9882_44f3_b6a1_c133f5595d2a_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id" name="link_fk_id_dataset_fkey" referencedLayer="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd" referencingLayer="link_6157b282_9882_44f3_b6a1_c133f5595d2a" strength="Association">
+      <fieldRef referencedField="id" referencingField="fk_id_dataset"></fieldRef>
     </relation>
   </relations>
-  <mapcanvas name="theMapCanvas" annotationsVisible="1">
+  <polymorphicRelations></polymorphicRelations>
+  <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
       <xmin>5.04407452150329672</xmin>
@@ -119,7 +157,7 @@
     <rotation>0</rotation>
     <destinationsrs>
       <spatialrefsys>
-        <wkt>GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+        <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
         <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
         <srsid>3452</srsid>
         <srid>4326</srid>
@@ -131,92 +169,92 @@
       </spatialrefsys>
     </destinationsrs>
     <rendermaptile>0</rendermaptile>
-    <expressionContextScope/>
+    <expressionContextScope></expressionContextScope>
   </mapcanvas>
-  <projectModels/>
+  <projectModels></projectModels>
   <legend updateDrawingOrder="true">
-    <legendgroup checked="Qt::Checked" open="true" name="Configuration">
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" open="true" name="Contact">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="contact_640d326a_25a7_4b9c_8878_42d1201a8198" visible="1"/>
+    <legendgroup checked="Qt::Checked" name="Configuration" open="true">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="Contact" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" layerid="contact_640d326a_25a7_4b9c_8878_42d1201a8198" visible="1"></legendlayerfile>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" open="true" name="Dataset &lt;-> Contact">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675" visible="1"/>
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="Dataset &lt;-> Contact" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" layerid="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675" visible="1"></legendlayerfile>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" open="true" name="Dataset">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd" visible="1"/>
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="Dataset" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" layerid="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd" visible="1"></legendlayerfile>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" open="true" name="Link">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="link_6157b282_9882_44f3_b6a1_c133f5595d2a" visible="1"/>
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="Link" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" layerid="link_6157b282_9882_44f3_b6a1_c133f5595d2a" visible="1"></legendlayerfile>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" open="true" name="HTML templates">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="html_template_e9cca240_a640_4a7c_a9d0_a181beb9797e" visible="1"/>
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="HTML templates" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" layerid="html_template_e9cca240_a640_4a7c_a9d0_a181beb9797e" visible="1"></legendlayerfile>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" open="true" name="Glossary">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab" visible="1"/>
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="Glossary" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" layerid="glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab" visible="1"></legendlayerfile>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" open="true" name="Theme">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="theme_3d260140_3e41_4dbe_8e79_813f3f5d3d50" visible="1"/>
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="Theme" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" layerid="theme_3d260140_3e41_4dbe_8e79_813f3f5d3d50" visible="1"></legendlayerfile>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Information">
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" open="true" name="Table list">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="v_table_list_48c78797_5376_47b8_90e0_8c4f8236fa44" visible="1"/>
+    <legendgroup checked="Qt::Checked" name="Information" open="true">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="Table list" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" layerid="v_table_list_48c78797_5376_47b8_90e0_8c4f8236fa44" visible="1"></legendlayerfile>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" open="true" name="Schema list">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="v_schema_list_140f3a29_ae94_480c_932c_fb47bdad292c" visible="1"/>
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="Schema list" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" layerid="v_schema_list_140f3a29_ae94_480c_932c_fb47bdad292c" visible="1"></legendlayerfile>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" open="true" name="Valid metadata">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="v_valid_dataset_4e46ef23_a5aa_441f_b21a_92bb573cbdfd" visible="1"/>
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="Valid metadata" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" layerid="v_valid_dataset_4e46ef23_a5aa_441f_b21a_92bb573cbdfd" visible="1"></legendlayerfile>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" open="true" name="Table comments">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="v_table_comment_from_metadata_d6be195f_86d0_4ef6_af4d_d1fef8a4b7f7" visible="1"/>
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="Table comments" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" layerid="v_table_comment_from_metadata_d6be195f_86d0_4ef6_af4d_d1fef8a4b7f7" visible="1"></legendlayerfile>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Information warnings">
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" open="true" name="Orphan tables">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="v_orphan_tables_33b5eba9_96d1_442a_a32e_90a10c6fd2e5" visible="1"/>
+    <legendgroup checked="Qt::Checked" name="Information warnings" open="true">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="Orphan tables" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" layerid="v_orphan_tables_33b5eba9_96d1_442a_a32e_90a10c6fd2e5" visible="1"></legendlayerfile>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" open="true" name="Orphan metadata">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="v_orphan_dataset_items_0fbfb83f_0c98_4391_bf51_8b5d8a362a73" visible="1"/>
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="Orphan metadata" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" layerid="v_orphan_dataset_items_0fbfb83f_0c98_4391_bf51_8b5d8a362a73" visible="1"></legendlayerfile>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Advanced">
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" drawingOrder="-1" open="true" name="Locales">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="v_locales_f4efa77e_8eb0_4d5a_809c_d479ae6cc850" visible="1"/>
+    <legendgroup checked="Qt::Checked" name="Advanced" open="true">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" name="Locales" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" layerid="v_locales_f4efa77e_8eb0_4d5a_809c_d479ae6cc850" visible="1"></legendlayerfile>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
-  <mapViewDocks/>
-  <mapViewDocks3D/>
-  <main-annotation-layer refreshOnNotifyMessage="" type="annotation" refreshOnNotifyEnabled="0" autoRefreshTime="0" autoRefreshEnabled="0">
+  <mapViewDocks></mapViewDocks>
+  <mapViewDocks3D></mapViewDocks3D>
+  <main-annotation-layer autoRefreshEnabled="0" autoRefreshTime="0" legendPlaceholderImage="" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" type="annotation">
     <id>Annotations_cf42651e_5b61_4496_9a61_b4923b089864</id>
     <datasource></datasource>
     <keywordList>
@@ -243,7 +281,7 @@
       <type></type>
       <title></title>
       <abstract></abstract>
-      <links/>
+      <links></links>
       <fees></fees>
       <encoding></encoding>
       <crs>
@@ -259,13 +297,15 @@
           <geographicflag>false</geographicflag>
         </spatialrefsys>
       </crs>
-      <extent/>
+      <extent></extent>
     </resourceMetadata>
-    <items/>
+    <items></items>
     <layerOpacity>1</layerOpacity>
+    <blendMode>0</blendMode>
+    <paintEffect></paintEffect>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer refreshOnNotifyMessage="" readOnly="0" type="vector" refreshOnNotifyEnabled="0" geometry="No geometry" maxScale="0" autoRefreshTime="0" wkbType="NoGeometry" styleCategories="AllStyleCategories" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" geometry="No geometry" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" maxScale="0" minScale="1e+08" readOnly="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" type="vector" wkbType="NoGeometry">
       <id>contact_640d326a_25a7_4b9c_8878_42d1201a8198</id>
       <datasource>service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table="pgmetadata"."contact"</datasource>
       <keywordList>
@@ -301,7 +341,7 @@
           <email></email>
           <role></role>
         </contact>
-        <links/>
+        <links></links>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -318,7 +358,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxx="0" dimensions="2" crs="" miny="0" maxz="0" minz="0" minx="0" maxy="0"/>
+          <spatial crs="" dimensions="2" maxx="0" maxy="0" maxz="0" minx="0" miny="0" minz="0"></spatial>
           <temporal>
             <period>
               <start></start>
@@ -328,156 +368,160 @@
         </extent>
       </resourceMetadata>
       <provider encoding="">postgres</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
+      <vectorjoins></vectorjoins>
+      <layerDependencies></layerDependencies>
+      <dataDependencies></dataDependencies>
+      <expressionfields></expressionfields>
       <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
+        <map-layer-style name="default"></map-layer-style>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
+      <auxiliaryLayer></auxiliaryLayer>
+      <metadataUrls></metadataUrls>
       <flags>
         <Identifiable>1</Identifiable>
         <Removable>1</Removable>
         <Searchable>1</Searchable>
+        <Private>0</Private>
       </flags>
-      <temporal endExpression="" startField="" startExpression="" enabled="0" fixedDuration="0" accumulate="0" durationUnit="min" mode="0" endField="" durationField="">
+      <temporal accumulate="0" durationField="" durationUnit="min" enabled="0" endExpression="" endField="" fixedDuration="0" limitMode="0" mode="0" startExpression="" startField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
       <customproperties>
-        <property value="concat(&quot;name&quot;, ' (', &quot;organisation_name&quot;, ')')" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
+        <Option type="Map">
+          <Option name="dualview/previewExpressions" type="QString" value="concat(&quot;name&quot;, ' (', &quot;organisation_name&quot;, ')')"></Option>
+          <Option name="embeddedWidgets/count" type="QString" value="0"></Option>
+          <Option name="variableNames"></Option>
+          <Option name="variableValues"></Option>
+        </Option>
       </customproperties>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+        <activeChecks></activeChecks>
+        <checkConfiguration></checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector"/>
-      <referencedLayers/>
+      <legend showLabelLegend="0" type="default-vector"></legend>
+      <referencedLayers></referencedLayers>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="organisation_name" configurationFlags="None">
+        <field configurationFlags="None" name="organisation_name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="organisation_unit" configurationFlags="None">
+        <field configurationFlags="None" name="organisation_unit">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="email" configurationFlags="None">
+        <field configurationFlags="None" name="email">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-         <field name="phone" configurationFlags="None">
+        <field configurationFlags="None" name="phone">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="Id" index="0"/>
-        <alias field="name" name="Name" index="1"/>
-        <alias field="organisation_name" name="Organisation" index="2"/>
-        <alias field="organisation_unit" name="Organisation unit" index="3"/>
-        <alias field="email" name="Email" index="4"/>
-        <alias field="phone" name="Phone" index="5"/>
+        <alias field="id" index="0" name="Id"></alias>
+        <alias field="name" index="1" name="Name"></alias>
+        <alias field="organisation_name" index="2" name="Organisation"></alias>
+        <alias field="organisation_unit" index="3" name="Organisation unit"></alias>
+        <alias field="email" index="4" name="Email"></alias>
+        <alias field="phone" index="5" name="Phone"></alias>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="organisation_name" applyOnUpdate="0"/>
-        <default expression="" field="organisation_unit" applyOnUpdate="0"/>
-        <default expression="" field="email" applyOnUpdate="0"/>
-        <default expression="" field="phone" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"></default>
+        <default applyOnUpdate="0" expression="" field="name"></default>
+        <default applyOnUpdate="0" expression="" field="organisation_name"></default>
+        <default applyOnUpdate="0" expression="" field="organisation_unit"></default>
+        <default applyOnUpdate="0" expression="" field="email"></default>
+        <default applyOnUpdate="0" expression="" field="phone"></default>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" constraints="3" field="id" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="1" field="name" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="1" field="organisation_name" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="0" field="organisation_unit" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="email" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="phone" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="3" exp_strength="0" field="id" notnull_strength="1" unique_strength="1"></constraint>
+        <constraint constraints="1" exp_strength="0" field="name" notnull_strength="1" unique_strength="0"></constraint>
+        <constraint constraints="1" exp_strength="0" field="organisation_name" notnull_strength="1" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="organisation_unit" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="email" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="phone" notnull_strength="0" unique_strength="0"></constraint>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="organisation_name" desc="" exp=""/>
-        <constraint field="organisation_unit" desc="" exp=""/>
-        <constraint field="email" desc="" exp=""/>
-        <constraint field="phone" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"></constraint>
+        <constraint desc="" exp="" field="name"></constraint>
+        <constraint desc="" exp="" field="organisation_name"></constraint>
+        <constraint desc="" exp="" field="organisation_unit"></constraint>
+        <constraint desc="" exp="" field="email"></constraint>
+        <constraint desc="" exp="" field="phone"></constraint>
       </constraintExpressions>
-      <expressionfields/>
+      <expressionfields></expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"></defaultAction>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="name" width="-1" hidden="0"/>
-          <column type="field" name="organisation_name" width="-1" hidden="0"/>
-          <column type="field" name="organisation_unit" width="-1" hidden="0"/>
-          <column type="field" name="email" width="-1" hidden="0"/>
-          <column type="field" name="phone" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" name="id" type="field" width="-1"></column>
+          <column hidden="0" name="name" type="field" width="-1"></column>
+          <column hidden="0" name="organisation_name" type="field" width="-1"></column>
+          <column hidden="0" name="organisation_unit" type="field" width="-1"></column>
+          <column hidden="0" name="email" type="field" width="-1"></column>
+          <column hidden="0" name="phone" type="field" width="-1"></column>
+          <column hidden="1" type="actions" width="-1"></column>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
+        <rowstyles></rowstyles>
+        <fieldstyles></fieldstyles>
       </conditionalstyles>
-      <storedexpressions/>
+      <storedexpressions></storedexpressions>
       <editform tolerant="1"></editform>
-      <editforminit/>
+      <editforminit></editforminit>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+      <editforminitcode># -*- coding: utf-8 -*-
 """
 QGIS forms can have a Python function that is called when the form is
 opened.
@@ -493,44 +537,45 @@ from qgis.PyQt.QtWidgets import QWidget
 def my_form_open(dialog, layer, feature):
 	geom = feature.geometry()
 	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
+</editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>tablayout</editorlayout>
       <attributeEditorForm>
-        <attributeEditorField name="name" index="1" showLabel="1"/>
-        <attributeEditorField name="organisation_name" index="2" showLabel="1"/>
-        <attributeEditorField name="organisation_unit" index="3" showLabel="1"/>
-        <attributeEditorField name="email" index="4" showLabel="1"/>
-        <attributeEditorField name="phone" index="4" showLabel="1"/>
+        <attributeEditorField index="1" name="name" showLabel="1"></attributeEditorField>
+        <attributeEditorField index="2" name="organisation_name" showLabel="1"></attributeEditorField>
+        <attributeEditorField index="3" name="organisation_unit" showLabel="1"></attributeEditorField>
+        <attributeEditorField index="4" name="email" showLabel="1"></attributeEditorField>
+        <attributeEditorField index="5" name="phone" showLabel="1"></attributeEditorField>
       </attributeEditorForm>
       <editable>
-        <field editable="1" name="email"/>
-        <field editable="0" name="id"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="organisation_name"/>
-        <field editable="1" name="organisation_unit"/>
-        <field editable="1" name="phone"/>
+        <field editable="1" name="email"></field>
+        <field editable="0" name="id"></field>
+        <field editable="1" name="name"></field>
+        <field editable="1" name="organisation_name"></field>
+        <field editable="1" name="organisation_unit"></field>
+        <field editable="1" name="phone"></field>
       </editable>
       <labelOnTop>
-        <field name="email" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="organisation_name" labelOnTop="0"/>
-        <field name="organisation_unit" labelOnTop="0"/>
-        <field name="phone" labelOnTop="0"/>
+        <field labelOnTop="0" name="email"></field>
+        <field labelOnTop="0" name="id"></field>
+        <field labelOnTop="0" name="name"></field>
+        <field labelOnTop="0" name="organisation_name"></field>
+        <field labelOnTop="0" name="organisation_unit"></field>
+        <field labelOnTop="0" name="phone"></field>
       </labelOnTop>
-      <dataDefinedFieldProperties/>
+      <reuseLastValue></reuseLastValue>
+      <dataDefinedFieldProperties></dataDefinedFieldProperties>
       <widgets>
         <widget name="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675_fk_id_contact_contact_640d326a_25a7_4b9c_8878_42d1201a8198_id">
           <config type="Map">
-            <Option type="QString" value="" name="nm-rel"/>
+            <Option name="nm-rel" type="QString" value=""></Option>
           </config>
         </widget>
       </widgets>
       <previewExpression>concat("name", ' (', "organisation_name", ')')</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer labelsEnabled="1" simplifyMaxScale="1" maxScale="0" minScale="100000000" refreshOnNotifyEnabled="0" geometry="Polygon" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" simplifyLocal="0" wkbType="Polygon" simplifyAlgorithm="0" styleCategories="AllStyleCategories" simplifyDrawingHints="1" readOnly="0" type="vector">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" geometry="Polygon" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" legendPlaceholderImage="" maxScale="0" minScale="100000000" readOnly="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyDrawingHints="1" simplifyDrawingTol="1" simplifyLocal="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" type="vector" wkbType="Polygon">
       <id>dataset_00c9da4d_d717_48cc_a848_0d4544b019fd</id>
       <datasource>service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true srid=4326 type=Polygon checkPrimaryKeyUnicity='1' table="pgmetadata"."dataset" (geom)</datasource>
       <keywordList>
@@ -539,7 +584,7 @@ def my_form_open(dialog, layer, feature):
       <layername>Dataset</layername>
       <srs>
         <spatialrefsys>
-          <wkt>GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
           <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
           <srsid>3452</srsid>
           <srid>4326</srid>
@@ -566,7 +611,7 @@ def my_form_open(dialog, layer, feature):
           <email></email>
           <role></role>
         </contact>
-        <links/>
+        <links></links>
         <fees></fees>
         <constraints type="undefined 1">undefined 1</constraints>
         <rights></rights>
@@ -574,7 +619,7 @@ def my_form_open(dialog, layer, feature):
         <encoding></encoding>
         <crs>
           <spatialrefsys>
-            <wkt>GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
             <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
             <srsid>3452</srsid>
             <srid>4326</srid>
@@ -586,7 +631,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxx="0" dimensions="2" crs="EPSG:4326" miny="0" maxz="0" minz="0" minx="0" maxy="0"/>
+          <spatial crs="EPSG:4326" dimensions="2" maxx="0" maxy="0" maxz="0" minx="0" miny="0" minz="0"></spatial>
           <temporal>
             <period>
               <start></start>
@@ -596,176 +641,315 @@ def my_form_open(dialog, layer, feature):
         </extent>
       </resourceMetadata>
       <provider encoding="">postgres</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
+      <vectorjoins></vectorjoins>
+      <layerDependencies></layerDependencies>
+      <dataDependencies></dataDependencies>
+      <expressionfields></expressionfields>
       <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
+        <map-layer-style name="default"></map-layer-style>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
+      <auxiliaryLayer></auxiliaryLayer>
+      <metadataUrls></metadataUrls>
       <flags>
         <Identifiable>1</Identifiable>
         <Removable>1</Removable>
         <Searchable>1</Searchable>
+        <Private>0</Private>
       </flags>
-      <temporal endExpression="" startField="" startExpression="" enabled="0" fixedDuration="0" accumulate="0" durationUnit="min" mode="0" endField="" durationField="">
+      <temporal accumulate="0" durationField="" durationUnit="min" enabled="0" endExpression="" endField="" fixedDuration="0" limitMode="0" mode="0" startExpression="" startField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <renderer-v2 symbollevels="0" type="singleSymbol" forceraster="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="fill" name="0" clip_to_extent="1" alpha="1">
-            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="160,40,64,255"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0,0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="outline_color" v="0,0,0,255"/>
-              <prop k="outline_style" v="dash"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="no"/>
+          <symbol alpha="1" clip_to_extent="1" force_rhr="0" name="0" type="fill">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""></Option>
+                <Option name="properties"></Option>
+                <Option name="type" type="QString" value="collection"></Option>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+              <Option type="Map">
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"></Option>
+                <Option name="color" type="QString" value="160,40,64,255"></Option>
+                <Option name="joinstyle" type="QString" value="bevel"></Option>
+                <Option name="offset" type="QString" value="0,0"></Option>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"></Option>
+                <Option name="offset_unit" type="QString" value="MM"></Option>
+                <Option name="outline_color" type="QString" value="0,0,0,255"></Option>
+                <Option name="outline_style" type="QString" value="dash"></Option>
+                <Option name="outline_width" type="QString" value="0.26"></Option>
+                <Option name="outline_width_unit" type="QString" value="MM"></Option>
+                <Option name="style" type="QString" value="no"></Option>
+              </Option>
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"></prop>
+              <prop k="color" v="160,40,64,255"></prop>
+              <prop k="joinstyle" v="bevel"></prop>
+              <prop k="offset" v="0,0"></prop>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"></prop>
+              <prop k="offset_unit" v="MM"></prop>
+              <prop k="outline_color" v="0,0,0,255"></prop>
+              <prop k="outline_style" v="dash"></prop>
+              <prop k="outline_width" v="0.26"></prop>
+              <prop k="outline_width_unit" v="MM"></prop>
+              <prop k="style" v="no"></prop>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option name="name" type="QString" value=""></Option>
+                  <Option name="properties"></Option>
+                  <Option name="type" type="QString" value="collection"></Option>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
-        <rotation/>
-        <sizescale/>
+        <rotation></rotation>
+        <sizescale></sizescale>
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOrientation="horizontal" fontUnderline="0" textOpacity="1" fontKerning="1" multilineHeight="1" allowHtml="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Regular" fontFamily="Ubuntu" fontSizeUnit="Point" textColor="0,0,0,255" fontLetterSpacing="0" fontSize="8" fontWeight="50" fieldName="wordwrap(title, 15, ' ')" blendMode="0" fontWordSpacing="0" fontItalic="0" capitalization="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255">
-            <text-buffer bufferSize="0.7" bufferSizeUnits="MM" bufferBlendMode="0" bufferOpacity="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskEnabled="0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
-            <background shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeRadiiX="0" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeRotation="0" shapeSizeY="0" shapeOffsetY="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="" shapeOffsetX="0" shapeBlendMode="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" alpha="1">
-                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
-                  <prop k="angle" v="0"/>
-                  <prop k="color" v="164,113,88,255"/>
-                  <prop k="horizontal_anchor_point" v="1"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="name" v="circle"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MM"/>
-                  <prop k="outline_color" v="35,35,35,255"/>
-                  <prop k="outline_style" v="solid"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="scale_method" v="diameter"/>
-                  <prop k="size" v="2"/>
-                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="size_unit" v="MM"/>
-                  <prop k="vertical_anchor_point" v="1"/>
+          <text-style allowHtml="0" blendMode="0" capitalization="0" fieldName="wordwrap(title, 15, ' ')" fontFamily="Sans Serif" fontItalic="0" fontKerning="1" fontLetterSpacing="0" fontSize="8" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" fontStrikeout="0" fontUnderline="0" fontWeight="50" fontWordSpacing="0" isExpression="1" legendString="Aa" multilineHeight="1" namedStyle="Regular" previewBkgrdColor="255,255,255,255" textColor="0,0,0,255" textOpacity="1" textOrientation="horizontal" useSubstitutions="0">
+            <families></families>
+            <text-buffer bufferBlendMode="0" bufferColor="255,255,255,255" bufferDraw="1" bufferJoinStyle="128" bufferNoFill="1" bufferOpacity="1" bufferSize="0.69999999999999996" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM"></text-buffer>
+            <text-mask maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskType="0" maskedSymbolLayers=""></text-mask>
+            <background shapeBlendMode="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeDraw="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeOffsetY="0" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeSizeUnit="MM" shapeSizeX="0" shapeSizeY="0" shapeType="0">
+              <symbol alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" type="marker">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""></Option>
+                    <Option name="properties"></Option>
+                    <Option name="type" type="QString" value="collection"></Option>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
+                  <Option type="Map">
+                    <Option name="angle" type="QString" value="0"></Option>
+                    <Option name="cap_style" type="QString" value="square"></Option>
+                    <Option name="color" type="QString" value="164,113,88,255"></Option>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"></Option>
+                    <Option name="joinstyle" type="QString" value="bevel"></Option>
+                    <Option name="name" type="QString" value="circle"></Option>
+                    <Option name="offset" type="QString" value="0,0"></Option>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"></Option>
+                    <Option name="offset_unit" type="QString" value="MM"></Option>
+                    <Option name="outline_color" type="QString" value="35,35,35,255"></Option>
+                    <Option name="outline_style" type="QString" value="solid"></Option>
+                    <Option name="outline_width" type="QString" value="0"></Option>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"></Option>
+                    <Option name="outline_width_unit" type="QString" value="MM"></Option>
+                    <Option name="scale_method" type="QString" value="diameter"></Option>
+                    <Option name="size" type="QString" value="2"></Option>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"></Option>
+                    <Option name="size_unit" type="QString" value="MM"></Option>
+                    <Option name="vertical_anchor_point" type="QString" value="1"></Option>
+                  </Option>
+                  <prop k="angle" v="0"></prop>
+                  <prop k="cap_style" v="square"></prop>
+                  <prop k="color" v="164,113,88,255"></prop>
+                  <prop k="horizontal_anchor_point" v="1"></prop>
+                  <prop k="joinstyle" v="bevel"></prop>
+                  <prop k="name" v="circle"></prop>
+                  <prop k="offset" v="0,0"></prop>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"></prop>
+                  <prop k="offset_unit" v="MM"></prop>
+                  <prop k="outline_color" v="35,35,35,255"></prop>
+                  <prop k="outline_style" v="solid"></prop>
+                  <prop k="outline_width" v="0"></prop>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"></prop>
+                  <prop k="outline_width_unit" v="MM"></prop>
+                  <prop k="scale_method" v="diameter"></prop>
+                  <prop k="size" v="2"></prop>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"></prop>
+                  <prop k="size_unit" v="MM"></prop>
+                  <prop k="vertical_anchor_point" v="1"></prop>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option name="name" type="QString" value=""></Option>
+                      <Option name="properties"></Option>
+                      <Option name="type" type="QString" value="collection"></Option>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+              <symbol alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" type="fill">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""></Option>
+                    <Option name="properties"></Option>
+                    <Option name="type" type="QString" value="collection"></Option>
+                  </Option>
+                </data_defined_properties>
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
+                  <Option type="Map">
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"></Option>
+                    <Option name="color" type="QString" value="255,255,255,255"></Option>
+                    <Option name="joinstyle" type="QString" value="bevel"></Option>
+                    <Option name="offset" type="QString" value="0,0"></Option>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"></Option>
+                    <Option name="offset_unit" type="QString" value="MM"></Option>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"></Option>
+                    <Option name="outline_style" type="QString" value="no"></Option>
+                    <Option name="outline_width" type="QString" value="0"></Option>
+                    <Option name="outline_width_unit" type="QString" value="MM"></Option>
+                    <Option name="style" type="QString" value="solid"></Option>
+                  </Option>
+                  <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"></prop>
+                  <prop k="color" v="255,255,255,255"></prop>
+                  <prop k="joinstyle" v="bevel"></prop>
+                  <prop k="offset" v="0,0"></prop>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"></prop>
+                  <prop k="offset_unit" v="MM"></prop>
+                  <prop k="outline_color" v="128,128,128,255"></prop>
+                  <prop k="outline_style" v="no"></prop>
+                  <prop k="outline_width" v="0"></prop>
+                  <prop k="outline_width_unit" v="MM"></prop>
+                  <prop k="style" v="solid"></prop>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
+                      <Option name="name" type="QString" value=""></Option>
+                      <Option name="properties"></Option>
+                      <Option name="type" type="QString" value="collection"></Option>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowScale="100" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowBlendMode="6" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetUnit="MM" shadowUnder="0" shadowOpacity="0.7"/>
+            <shadow shadowBlendMode="6" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowScale="100" shadowUnder="0"></shadow>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
-                <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option name="name" type="QString" value=""></Option>
+                <Option name="properties"></Option>
+                <Option name="type" type="QString" value="collection"></Option>
               </Option>
             </dd_properties>
-            <substitutions/>
+            <substitutions></substitutions>
           </text-style>
-          <text-format multilineAlign="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" decimals="3" autoWrapLength="0" formatNumbers="0" wrapChar="" plussign="0" addDirectionSymbol="0"/>
-          <placement repeatDistance="0" placement="0" quadOffset="4" lineAnchorType="0" overrunDistanceUnit="MM" offsetType="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" offsetUnits="MM" yOffset="0" rotationAngle="0" polygonPlacementFlags="2" repeatDistanceUnits="MM" overrunDistance="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" placementFlags="10" fitInPolygonOnly="0" layerType="PolygonGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" priority="5" centroidWhole="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" centroidInside="0" preserveRotation="1" xOffset="0"/>
-          <rendering minFeatureSize="0" fontMinPixelSize="3" obstacleFactor="1" scaleMin="0" zIndex="0" labelPerPart="0" fontLimitPixelSize="0" displayAll="0" scaleVisibility="0" limitNumLabels="0" obstacleType="0" mergeLines="0" drawLabels="1" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1" maxNumLabels="2000" scaleMax="0"/>
+          <text-format addDirectionSymbol="0" autoWrapLength="0" decimals="3" formatNumbers="0" leftDirectionSymbol="&lt;" multilineAlign="0" placeDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" wrapChar=""></text-format>
+          <placement centroidInside="0" centroidWhole="0" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" fitInPolygonOnly="0" geometryGenerator="" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" layerType="PolygonGeometry" lineAnchorClipping="0" lineAnchorPercent="0.5" lineAnchorType="0" maxCurvedCharAngleIn="25" maxCurvedCharAngleOut="-25" offsetType="0" offsetUnits="MM" overrunDistance="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" placementFlags="10" polygonPlacementFlags="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" preserveRotation="1" priority="5" quadOffset="4" repeatDistance="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" rotationAngle="0" rotationUnit="AngleDegrees" xOffset="0" yOffset="0"></placement>
+          <rendering displayAll="0" drawLabels="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" fontMinPixelSize="3" labelPerPart="0" limitNumLabels="0" maxNumLabels="2000" mergeLines="0" minFeatureSize="0" obstacle="1" obstacleFactor="1" obstacleType="0" scaleMax="0" scaleMin="0" scaleVisibility="0" unplacedVisibility="0" upsidedownLabels="0" zIndex="0"></rendering>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option name="name" type="QString" value=""></Option>
+              <Option name="properties"></Option>
+              <Option name="type" type="QString" value="collection"></Option>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" value="" name="name"/>
-                <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"></Option>
+              <Option name="blendMode" type="int" value="0"></Option>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""></Option>
+                <Option name="properties"></Option>
+                <Option name="type" type="QString" value="collection"></Option>
               </Option>
-              <Option type="bool" value="false" name="drawToAllParts"/>
-              <Option type="QString" value="0" name="enabled"/>
-              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-              <Option type="QString" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-              <Option type="double" value="0" name="minLength"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-              <Option type="QString" value="MM" name="minLengthUnit"/>
-              <Option type="double" value="0" name="offsetFromAnchor"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-              <Option type="double" value="0" name="offsetFromLabel"/>
-              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" type="bool" value="false"></Option>
+              <Option name="enabled" type="QString" value="0"></Option>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"></Option>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol clip_to_extent=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"></Option>
+              <Option name="minLength" type="double" value="0"></Option>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"></Option>
+              <Option name="minLengthUnit" type="QString" value="MM"></Option>
+              <Option name="offsetFromAnchor" type="double" value="0"></Option>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"></Option>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"></Option>
+              <Option name="offsetFromLabel" type="double" value="0"></Option>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"></Option>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"></Option>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
-        <property value="concat(&quot;schema_name&quot;, '.', &quot;table_name&quot;)" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
+        <Option type="Map">
+          <Option name="dualview/previewExpressions" type="QString" value="concat(&quot;schema_name&quot;, '.', &quot;table_name&quot;)"></Option>
+          <Option name="embeddedWidgets/count" type="QString" value="0"></Option>
+          <Option name="variableNames"></Option>
+          <Option name="variableValues"></Option>
+        </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" spacingUnitScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" penWidth="0" backgroundAlpha="255" maxScaleDenominator="1e+08" enabled="0" height="15" penColor="#000000" barWidth="5" spacingUnit="MM" lineSizeType="MM" labelPlacementMethod="XHeight" opacity="1" backgroundColor="#ffffff" spacing="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" minScaleDenominator="0" rotationOffset="270" showAxis="0" direction="1" scaleBasedVisibility="0" minimumSize="0">
-          <fontProperties description="Ubuntu,11,-1,5,50,0,0,0,0,0" style=""/>
-          <attribute field="" color="#000000" label=""/>
+        <DiagramCategory backgroundAlpha="255" backgroundColor="#ffffff" barWidth="5" diagramOrientation="Up" direction="1" enabled="0" height="15" labelPlacementMethod="XHeight" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" maxScaleDenominator="1e+08" minScaleDenominator="0" minimumSize="0" opacity="1" penAlpha="255" penColor="#000000" penWidth="0" rotationOffset="270" scaleBasedVisibility="0" scaleDependency="Area" showAxis="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" spacing="0" spacingUnit="MM" spacingUnitScale="3x:0,0,0,0,0,0" width="15">
+          <fontProperties description="Ubuntu,11,-1,5,50,0,0,0,0,0" style=""></fontProperties>
+          <attribute color="#000000" colorOpacity="1" field="" label=""></attribute>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" alpha="1">
-              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
-                <prop k="align_dash_pattern" v="0"/>
-                <prop k="capstyle" v="square"/>
-                <prop k="customdash" v="5;2"/>
-                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="customdash_unit" v="MM"/>
-                <prop k="dash_pattern_offset" v="0"/>
-                <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="dash_pattern_offset_unit" v="MM"/>
-                <prop k="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="35,35,35,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0.26"/>
-                <prop k="line_width_unit" v="MM"/>
-                <prop k="offset" v="0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="ring_filter" v="0"/>
-                <prop k="tweak_dash_pattern_on_corners" v="0"/>
-                <prop k="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+            <symbol alpha="1" clip_to_extent="1" force_rhr="0" name="" type="line">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""></Option>
+                  <Option name="properties"></Option>
+                  <Option name="type" type="QString" value="collection"></Option>
+                </Option>
+              </data_defined_properties>
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
+                <Option type="Map">
+                  <Option name="align_dash_pattern" type="QString" value="0"></Option>
+                  <Option name="capstyle" type="QString" value="square"></Option>
+                  <Option name="customdash" type="QString" value="5;2"></Option>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"></Option>
+                  <Option name="customdash_unit" type="QString" value="MM"></Option>
+                  <Option name="dash_pattern_offset" type="QString" value="0"></Option>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"></Option>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"></Option>
+                  <Option name="draw_inside_polygon" type="QString" value="0"></Option>
+                  <Option name="joinstyle" type="QString" value="bevel"></Option>
+                  <Option name="line_color" type="QString" value="35,35,35,255"></Option>
+                  <Option name="line_style" type="QString" value="solid"></Option>
+                  <Option name="line_width" type="QString" value="0.26"></Option>
+                  <Option name="line_width_unit" type="QString" value="MM"></Option>
+                  <Option name="offset" type="QString" value="0"></Option>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"></Option>
+                  <Option name="offset_unit" type="QString" value="MM"></Option>
+                  <Option name="ring_filter" type="QString" value="0"></Option>
+                  <Option name="trim_distance_end" type="QString" value="0"></Option>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"></Option>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"></Option>
+                  <Option name="trim_distance_start" type="QString" value="0"></Option>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"></Option>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"></Option>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"></Option>
+                  <Option name="use_custom_dash" type="QString" value="0"></Option>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"></Option>
+                </Option>
+                <prop k="align_dash_pattern" v="0"></prop>
+                <prop k="capstyle" v="square"></prop>
+                <prop k="customdash" v="5;2"></prop>
+                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"></prop>
+                <prop k="customdash_unit" v="MM"></prop>
+                <prop k="dash_pattern_offset" v="0"></prop>
+                <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"></prop>
+                <prop k="dash_pattern_offset_unit" v="MM"></prop>
+                <prop k="draw_inside_polygon" v="0"></prop>
+                <prop k="joinstyle" v="bevel"></prop>
+                <prop k="line_color" v="35,35,35,255"></prop>
+                <prop k="line_style" v="solid"></prop>
+                <prop k="line_width" v="0.26"></prop>
+                <prop k="line_width_unit" v="MM"></prop>
+                <prop k="offset" v="0"></prop>
+                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"></prop>
+                <prop k="offset_unit" v="MM"></prop>
+                <prop k="ring_filter" v="0"></prop>
+                <prop k="trim_distance_end" v="0"></prop>
+                <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"></prop>
+                <prop k="trim_distance_end_unit" v="MM"></prop>
+                <prop k="trim_distance_start" v="0"></prop>
+                <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"></prop>
+                <prop k="trim_distance_start_unit" v="MM"></prop>
+                <prop k="tweak_dash_pattern_on_corners" v="0"></prop>
+                <prop k="use_custom_dash" v="0"></prop>
+                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"></prop>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" value="" name="name"/>
-                    <Option name="properties"/>
-                    <Option type="QString" value="collection" name="type"/>
+                    <Option name="name" type="QString" value=""></Option>
+                    <Option name="properties"></Option>
+                    <Option name="type" type="QString" value="collection"></Option>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -773,520 +957,520 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" linePlacementFlags="18" priority="0" placement="1" obstacle="0" showAll="1" zIndex="0">
+      <DiagramLayerSettings dist="0" linePlacementFlags="18" obstacle="0" placement="1" priority="0" showAll="1" zIndex="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
-            <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option name="name" type="QString" value=""></Option>
+            <Option name="properties"></Option>
+            <Option name="type" type="QString" value="collection"></Option>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+        <activeChecks></activeChecks>
         <checkConfiguration type="Map">
-          <Option type="Map" name="QgsGeometryGapCheck">
-            <Option type="double" value="0" name="allowedGapsBuffer"/>
-            <Option type="bool" value="false" name="allowedGapsEnabled"/>
-            <Option type="QString" value="" name="allowedGapsLayer"/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" type="double" value="0"></Option>
+            <Option name="allowedGapsEnabled" type="bool" value="false"></Option>
+            <Option name="allowedGapsLayer" type="QString" value=""></Option>
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector"/>
-      <referencedLayers/>
+      <legend showLabelLegend="0" type="default-vector"></legend>
+      <referencedLayers></referencedLayers>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="uid" configurationFlags="None">
+        <field configurationFlags="None" name="uid">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="table_name" configurationFlags="None">
+        <field configurationFlags="None" name="table_name">
           <editWidget type="ValueRelation">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="AllowMulti"/>
-                <Option type="bool" value="false" name="AllowNull"/>
-                <Option type="QString" value=" &quot;schema_name&quot; = current_value('schema_name')" name="FilterExpression"/>
-                <Option type="QString" value="table_name" name="Key"/>
-                <Option type="QString" value="v_table_list_48c78797_5376_47b8_90e0_8c4f8236fa44" name="Layer"/>
-                <Option type="QString" value="Table list" name="LayerName"/>
-                <Option type="QString" value="postgres" name="LayerProviderName"/>
-                <Option type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable key='id' estimatedmetadata=false checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;v_table_list&quot; sql=" name="LayerSource"/>
-                <Option type="int" value="1" name="NofColumns"/>
-                <Option type="bool" value="false" name="OrderByValue"/>
-                <Option type="bool" value="false" name="UseCompleter"/>
-                <Option type="QString" value="table_name" name="Value"/>
+                <Option name="AllowMulti" type="bool" value="false"></Option>
+                <Option name="AllowNull" type="bool" value="false"></Option>
+                <Option name="FilterExpression" type="QString" value=" &quot;schema_name&quot; = current_value('schema_name')"></Option>
+                <Option name="Key" type="QString" value="table_name"></Option>
+                <Option name="Layer" type="QString" value="v_table_list_48c78797_5376_47b8_90e0_8c4f8236fa44"></Option>
+                <Option name="LayerName" type="QString" value="Table list"></Option>
+                <Option name="LayerProviderName" type="QString" value="postgres"></Option>
+                <Option name="LayerSource" type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable estimatedmetadata=true sslmode=disable key='id' estimatedmetadata=false checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;v_table_list&quot; sql="></Option>
+                <Option name="NofColumns" type="int" value="1"></Option>
+                <Option name="OrderByValue" type="bool" value="false"></Option>
+                <Option name="UseCompleter" type="bool" value="false"></Option>
+                <Option name="Value" type="QString" value="table_name"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="schema_name" configurationFlags="None">
+        <field configurationFlags="None" name="schema_name">
           <editWidget type="ValueRelation">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="AllowMulti"/>
-                <Option type="bool" value="false" name="AllowNull"/>
-                <Option type="QString" value="" name="FilterExpression"/>
-                <Option type="QString" value="schema_name" name="Key"/>
-                <Option type="QString" value="v_schema_list_140f3a29_ae94_480c_932c_fb47bdad292c" name="Layer"/>
-                <Option type="QString" value="Schema list" name="LayerName"/>
-                <Option type="QString" value="postgres" name="LayerProviderName"/>
-                <Option type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable key='id' estimatedmetadata=false checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;v_schema_list&quot; sql=" name="LayerSource"/>
-                <Option type="int" value="1" name="NofColumns"/>
-                <Option type="bool" value="false" name="OrderByValue"/>
-                <Option type="bool" value="false" name="UseCompleter"/>
-                <Option type="QString" value="schema_name" name="Value"/>
+                <Option name="AllowMulti" type="bool" value="false"></Option>
+                <Option name="AllowNull" type="bool" value="false"></Option>
+                <Option name="FilterExpression" type="QString" value=""></Option>
+                <Option name="Key" type="QString" value="schema_name"></Option>
+                <Option name="Layer" type="QString" value="v_schema_list_140f3a29_ae94_480c_932c_fb47bdad292c"></Option>
+                <Option name="LayerName" type="QString" value="Schema list"></Option>
+                <Option name="LayerProviderName" type="QString" value="postgres"></Option>
+                <Option name="LayerSource" type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable estimatedmetadata=true sslmode=disable key='id' estimatedmetadata=false checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;v_schema_list&quot; sql="></Option>
+                <Option name="NofColumns" type="int" value="1"></Option>
+                <Option name="OrderByValue" type="bool" value="false"></Option>
+                <Option name="UseCompleter" type="bool" value="false"></Option>
+                <Option name="Value" type="QString" value="schema_name"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="title" configurationFlags="None">
+        <field configurationFlags="None" name="title">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="abstract" configurationFlags="None">
+        <field configurationFlags="None" name="abstract">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="true" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="true"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="categories" configurationFlags="None">
+        <field configurationFlags="None" name="categories">
           <editWidget type="ValueRelation">
             <config>
               <Option type="Map">
-                <Option type="bool" value="true" name="AllowMulti"/>
-                <Option type="bool" value="true" name="AllowNull"/>
-                <Option type="QString" value="&quot;field&quot; = 'dataset.categories'" name="FilterExpression"/>
-                <Option type="QString" value="code" name="Key"/>
-                <Option type="QString" value="glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab" name="Layer"/>
-                <Option type="QString" value="Glossary" name="LayerName"/>
-                <Option type="QString" value="postgres" name="LayerProviderName"/>
-                <Option type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;glossary&quot; sql=" name="LayerSource"/>
-                <Option type="int" value="1" name="NofColumns"/>
-                <Option type="bool" value="true" name="OrderByValue"/>
-                <Option type="bool" value="true" name="UseCompleter"/>
-                <Option type="QString" value="label_en" name="Value"/>
+                <Option name="AllowMulti" type="bool" value="true"></Option>
+                <Option name="AllowNull" type="bool" value="true"></Option>
+                <Option name="FilterExpression" type="QString" value="&quot;field&quot; = 'dataset.categories'"></Option>
+                <Option name="Key" type="QString" value="code"></Option>
+                <Option name="Layer" type="QString" value="glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab"></Option>
+                <Option name="LayerName" type="QString" value="Glossary"></Option>
+                <Option name="LayerProviderName" type="QString" value="postgres"></Option>
+                <Option name="LayerSource" type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable estimatedmetadata=true sslmode=disable key='id' checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;glossary&quot; sql="></Option>
+                <Option name="NofColumns" type="int" value="1"></Option>
+                <Option name="OrderByValue" type="bool" value="true"></Option>
+                <Option name="UseCompleter" type="bool" value="true"></Option>
+                <Option name="Value" type="QString" value="label_en"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="keywords" configurationFlags="None">
+        <field configurationFlags="None" name="keywords">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="spatial_level" configurationFlags="None">
+        <field configurationFlags="None" name="spatial_level">
           <editWidget type="UniqueValues">
             <config>
               <Option type="Map">
-                <Option type="bool" value="true" name="Editable"/>
+                <Option name="Editable" type="bool" value="true"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="minimum_optimal_scale" configurationFlags="None">
+        <field configurationFlags="None" name="minimum_optimal_scale">
           <editWidget type="Range">
             <config>
               <Option type="Map">
-                <Option type="bool" value="true" name="AllowNull"/>
-                <Option type="int" value="1000000000" name="Max"/>
-                <Option type="int" value="1" name="Min"/>
-                <Option type="int" value="0" name="Precision"/>
-                <Option type="int" value="1" name="Step"/>
-                <Option type="QString" value="SpinBox" name="Style"/>
+                <Option name="AllowNull" type="bool" value="true"></Option>
+                <Option name="Max" type="int" value="1000000000"></Option>
+                <Option name="Min" type="int" value="1"></Option>
+                <Option name="Precision" type="int" value="0"></Option>
+                <Option name="Step" type="int" value="1"></Option>
+                <Option name="Style" type="QString" value="SpinBox"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="maximum_optimal_scale" configurationFlags="None">
+        <field configurationFlags="None" name="maximum_optimal_scale">
           <editWidget type="Range">
             <config>
               <Option type="Map">
-                <Option type="bool" value="true" name="AllowNull"/>
-                <Option type="int" value="1000000000" name="Max"/>
-                <Option type="int" value="1" name="Min"/>
-                <Option type="int" value="0" name="Precision"/>
-                <Option type="int" value="1" name="Step"/>
-                <Option type="QString" value="SpinBox" name="Style"/>
+                <Option name="AllowNull" type="bool" value="true"></Option>
+                <Option name="Max" type="int" value="1000000000"></Option>
+                <Option name="Min" type="int" value="1"></Option>
+                <Option name="Precision" type="int" value="0"></Option>
+                <Option name="Step" type="int" value="1"></Option>
+                <Option name="Style" type="QString" value="SpinBox"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="publication_date" configurationFlags="None">
+        <field configurationFlags="None" name="publication_date">
           <editWidget type="DateTime">
             <config>
               <Option type="Map">
-                <Option type="bool" value="true" name="allow_null"/>
-                <Option type="bool" value="true" name="calendar_popup"/>
-                <Option type="QString" value="yyyy-MM-dd HH:mm:ss" name="display_format"/>
-                <Option type="QString" value="yyyy-MM-dd HH:mm:ss" name="field_format"/>
-                <Option type="bool" value="false" name="field_iso_format"/>
+                <Option name="allow_null" type="bool" value="true"></Option>
+                <Option name="calendar_popup" type="bool" value="true"></Option>
+                <Option name="display_format" type="QString" value="yyyy-MM-dd HH:mm:ss"></Option>
+                <Option name="field_format" type="QString" value="yyyy-MM-dd HH:mm:ss"></Option>
+                <Option name="field_iso_format" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="publication_frequency" configurationFlags="None">
+        <field configurationFlags="None" name="publication_frequency">
           <editWidget type="ValueRelation">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="AllowMulti"/>
-                <Option type="bool" value="true" name="AllowNull"/>
-                <Option type="QString" value="&quot;field&quot; = 'dataset.publication_frequency'" name="FilterExpression"/>
-                <Option type="QString" value="code" name="Key"/>
-                <Option type="QString" value="glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab" name="Layer"/>
-                <Option type="QString" value="Glossary" name="LayerName"/>
-                <Option type="QString" value="postgres" name="LayerProviderName"/>
-                <Option type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable key='id' estimatedmetadata=false checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;glossary&quot; sql=" name="LayerSource"/>
-                <Option type="int" value="1" name="NofColumns"/>
-                <Option type="bool" value="true" name="OrderByValue"/>
-                <Option type="bool" value="false" name="UseCompleter"/>
-                <Option type="QString" value="label_en" name="Value"/>
+                <Option name="AllowMulti" type="bool" value="false"></Option>
+                <Option name="AllowNull" type="bool" value="true"></Option>
+                <Option name="FilterExpression" type="QString" value="&quot;field&quot; = 'dataset.publication_frequency'"></Option>
+                <Option name="Key" type="QString" value="code"></Option>
+                <Option name="Layer" type="QString" value="glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab"></Option>
+                <Option name="LayerName" type="QString" value="Glossary"></Option>
+                <Option name="LayerProviderName" type="QString" value="postgres"></Option>
+                <Option name="LayerSource" type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable estimatedmetadata=true sslmode=disable key='id' estimatedmetadata=false checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;glossary&quot; sql="></Option>
+                <Option name="NofColumns" type="int" value="1"></Option>
+                <Option name="OrderByValue" type="bool" value="true"></Option>
+                <Option name="UseCompleter" type="bool" value="false"></Option>
+                <Option name="Value" type="QString" value="label_en"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="license" configurationFlags="None">
+        <field configurationFlags="None" name="license">
           <editWidget type="ValueRelation">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="AllowMulti"/>
-                <Option type="bool" value="true" name="AllowNull"/>
-                <Option type="QString" value="&quot;field&quot; = 'dataset.license'" name="FilterExpression"/>
-                <Option type="QString" value="code" name="Key"/>
-                <Option type="QString" value="glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab" name="Layer"/>
-                <Option type="QString" value="Glossary" name="LayerName"/>
-                <Option type="QString" value="postgres" name="LayerProviderName"/>
-                <Option type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable key='id' estimatedmetadata=false checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;glossary&quot; sql=" name="LayerSource"/>
-                <Option type="int" value="1" name="NofColumns"/>
-                <Option type="bool" value="true" name="OrderByValue"/>
-                <Option type="bool" value="false" name="UseCompleter"/>
-                <Option type="QString" value="label_en" name="Value"/>
+                <Option name="AllowMulti" type="bool" value="false"></Option>
+                <Option name="AllowNull" type="bool" value="true"></Option>
+                <Option name="FilterExpression" type="QString" value="&quot;field&quot; = 'dataset.license'"></Option>
+                <Option name="Key" type="QString" value="code"></Option>
+                <Option name="Layer" type="QString" value="glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab"></Option>
+                <Option name="LayerName" type="QString" value="Glossary"></Option>
+                <Option name="LayerProviderName" type="QString" value="postgres"></Option>
+                <Option name="LayerSource" type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable estimatedmetadata=true sslmode=disable key='id' estimatedmetadata=false checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;glossary&quot; sql="></Option>
+                <Option name="NofColumns" type="int" value="1"></Option>
+                <Option name="OrderByValue" type="bool" value="true"></Option>
+                <Option name="UseCompleter" type="bool" value="false"></Option>
+                <Option name="Value" type="QString" value="label_en"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="license_attribution" configurationFlags="None">
-          <editWidget type="TextEdit">
+        <field configurationFlags="None" name="confidentiality">
+          <editWidget type="ValueRelation">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"></Option>
-                <Option name="UseHtml" type="bool" value="false"></Option>
+                <Option name="AllowMulti" type="bool" value="false"></Option>
+                <Option name="AllowNull" type="bool" value="true"></Option>
+                <Option name="FilterExpression" type="QString" value="&quot;field&quot; = 'dataset.confidentiality'"></Option>
+                <Option name="Key" type="QString" value="code"></Option>
+                <Option name="Layer" type="QString" value="glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab"></Option>
+                <Option name="LayerName" type="QString" value="Glossary"></Option>
+                <Option name="LayerProviderName" type="QString" value="postgres"></Option>
+                <Option name="LayerSource" type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable estimatedmetadata=true sslmode=disable key='id' estimatedmetadata=false checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;glossary&quot; sql="></Option>
+                <Option name="NofColumns" type="int" value="1"></Option>
+                <Option name="OrderByValue" type="bool" value="true"></Option>
+                <Option name="UseCompleter" type="bool" value="false"></Option>
+                <Option name="Value" type="QString" value="label_en"></Option>
               </Option>
             </config>
-          </editWidget>n
+          </editWidget>
         </field>
-        <field name="confidentiality" configurationFlags="None">
-          <editWidget type="ValueRelation">
+        <field configurationFlags="None" name="feature_count">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="AllowMulti"/>
-                <Option type="bool" value="true" name="AllowNull"/>
-                <Option type="QString" value="&quot;field&quot; = 'dataset.confidentiality'" name="FilterExpression"/>
-                <Option type="QString" value="code" name="Key"/>
-                <Option type="QString" value="glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab" name="Layer"/>
-                <Option type="QString" value="Glossary" name="LayerName"/>
-                <Option type="QString" value="postgres" name="LayerProviderName"/>
-                <Option type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable key='id' estimatedmetadata=false checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;glossary&quot; sql=" name="LayerSource"/>
-                <Option type="int" value="1" name="NofColumns"/>
-                <Option type="bool" value="true" name="OrderByValue"/>
-                <Option type="bool" value="false" name="UseCompleter"/>
-                <Option type="QString" value="label_en" name="Value"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="feature_count" configurationFlags="None">
+        <field configurationFlags="None" name="geometry_type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="geometry_type" configurationFlags="None">
+        <field configurationFlags="None" name="projection_name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="projection_name" configurationFlags="None">
+        <field configurationFlags="None" name="projection_authid">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="projection_authid" configurationFlags="None">
+        <field configurationFlags="None" name="spatial_extent">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="spatial_extent" configurationFlags="None">
-          <editWidget type="TextEdit">
+        <field configurationFlags="None" name="creation_date">
+          <editWidget type="DateTime">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="allow_null" type="bool" value="true"></Option>
+                <Option name="calendar_popup" type="bool" value="true"></Option>
+                <Option name="display_format" type="QString" value="yyyy-MM-dd HH:mm:ss"></Option>
+                <Option name="field_format" type="QString" value="yyyy-MM-dd HH:mm:ss"></Option>
+                <Option name="field_iso_format" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="creation_date" configurationFlags="None">
+        <field configurationFlags="None" name="update_date">
           <editWidget type="DateTime">
             <config>
               <Option type="Map">
-                <Option type="bool" value="true" name="allow_null"/>
-                <Option type="bool" value="true" name="calendar_popup"/>
-                <Option type="QString" value="yyyy-MM-dd HH:mm:ss" name="display_format"/>
-                <Option type="QString" value="yyyy-MM-dd HH:mm:ss" name="field_format"/>
-                <Option type="bool" value="false" name="field_iso_format"/>
+                <Option name="allow_null" type="bool" value="true"></Option>
+                <Option name="calendar_popup" type="bool" value="true"></Option>
+                <Option name="display_format" type="QString" value="yyyy-MM-dd HH:mm:ss"></Option>
+                <Option name="field_format" type="QString" value="yyyy-MM-dd HH:mm:ss"></Option>
+                <Option name="field_iso_format" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="update_date" configurationFlags="None">
+        <field configurationFlags="None" name="data_last_update">
           <editWidget type="DateTime">
             <config>
               <Option type="Map">
-                <Option type="bool" value="true" name="allow_null"/>
-                <Option type="bool" value="true" name="calendar_popup"/>
-                <Option type="QString" value="yyyy-MM-dd HH:mm:ss" name="display_format"/>
-                <Option type="QString" value="yyyy-MM-dd HH:mm:ss" name="field_format"/>
-                <Option type="bool" value="false" name="field_iso_format"/>
+                <Option name="allow_null" type="bool" value="true"></Option>
+                <Option name="calendar_popup" type="bool" value="true"></Option>
+                <Option name="display_format" type="QString" value="yyyy-MM-dd HH:mm:ss"></Option>
+                <Option name="field_format" type="QString" value="yyyy-MM-dd HH:mm:ss"></Option>
+                <Option name="field_iso_format" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="data_last_update" configurationFlags="None">
-          <editWidget type="DateTime">
+        <field configurationFlags="None" name="themes">
+          <editWidget type="ValueRelation">
             <config>
               <Option type="Map">
-                <Option type="bool" value="true" name="allow_null"/>
-                <Option type="bool" value="true" name="calendar_popup"/>
-                <Option type="QString" value="yyyy-MM-dd HH:mm:ss" name="display_format"/>
-                <Option type="QString" value="yyyy-MM-dd HH:mm:ss" name="field_format"/>
-                <Option type="bool" value="false" name="field_iso_format"/>
+                <Option name="AllowMulti" type="bool" value="true"></Option>
+                <Option name="AllowNull" type="bool" value="true"></Option>
+                <Option name="FilterExpression" type="QString" value=""></Option>
+                <Option name="Key" type="QString" value="code"></Option>
+                <Option name="Layer" type="QString" value="theme_3d260140_3e41_4dbe_8e79_813f3f5d3d50"></Option>
+                <Option name="LayerName" type="QString" value="Theme"></Option>
+                <Option name="LayerProviderName" type="QString" value="postgres"></Option>
+                <Option name="LayerSource" type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable estimatedmetadata=true sslmode=disable key='label' checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;theme&quot; sql="></Option>
+                <Option name="NofColumns" type="int" value="1"></Option>
+                <Option name="OrderByValue" type="bool" value="true"></Option>
+                <Option name="UseCompleter" type="bool" value="false"></Option>
+                <Option name="Value" type="QString" value="label"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="themes" configurationFlags="None">
-          <editWidget type="ValueRelation">
+        <field configurationFlags="None" name="license_attribution">
+          <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="true" name="AllowMulti"/>
-                <Option type="bool" value="true" name="AllowNull"/>
-                <Option type="QString" value="" name="FilterExpression"/>
-                <Option type="QString" value="code" name="Key"/>
-                <Option type="QString" value="theme_3d260140_3e41_4dbe_8e79_813f3f5d3d50" name="Layer"/>
-                <Option type="QString" value="Theme" name="LayerName"/>
-                <Option type="QString" value="postgres" name="LayerProviderName"/>
-                <Option type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable key='label' checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;theme&quot; sql=" name="LayerSource"/>
-                <Option type="int" value="1" name="NofColumns"/>
-                <Option type="bool" value="true" name="OrderByValue"/>
-                <Option type="bool" value="false" name="UseCompleter"/>
-                <Option type="QString" value="label" name="Value"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="Id" index="0"/>
-        <alias field="uid" name="Unique ID" index="1"/>
-        <alias field="table_name" name="Table" index="2"/>
-        <alias field="schema_name" name="Schema" index="3"/>
-        <alias field="title" name="Title" index="4"/>
-        <alias field="abstract" name="Abstract" index="5"/>
-        <alias field="categories" name="Categories" index="6"/>
-        <alias field="keywords" name="Keywords, separated by ," index="7"/>
-        <alias field="spatial_level" name="Spatial level" index="8"/>
-        <alias field="minimum_optimal_scale" name="Minimum optimal scale" index="9"/>
-        <alias field="maximum_optimal_scale" name="Maximum optimal scale" index="10"/>
-        <alias field="publication_date" name="Date of publication" index="11"/>
-        <alias field="publication_frequency" name="Publication frequency" index="12"/>
-        <alias field="license" name="License" index="13"/>
-        <alias field="confidentiality" name="Confidentiality" index="14"/>
-        <alias field="feature_count" name="Feature count" index="15"/>
-        <alias field="geometry_type" name="Geometry type" index="16"/>
-        <alias field="projection_name" name="Projection name" index="17"/>
-        <alias field="projection_authid" name="Projection auth Id" index="18"/>
-        <alias field="spatial_extent" name="Spatial extent" index="19"/>
-        <alias field="creation_date" name="Created at" index="20"/>
-        <alias field="update_date" name="Last updated at" index="21"/>
-        <alias field="data_last_update" name="Data last update" index="22"/>
-        <alias field="themes" name="Themes" index="23"/>
-        <alias field="license_attribution" name="License attribution" index="24"/>
+        <alias field="id" index="0" name="Id"></alias>
+        <alias field="uid" index="1" name="Unique ID"></alias>
+        <alias field="table_name" index="2" name="Table"></alias>
+        <alias field="schema_name" index="3" name="Schema"></alias>
+        <alias field="title" index="4" name="Title"></alias>
+        <alias field="abstract" index="5" name="Abstract"></alias>
+        <alias field="categories" index="6" name="Categories"></alias>
+        <alias field="keywords" index="7" name="Keywords, separated by ,"></alias>
+        <alias field="spatial_level" index="8" name="Spatial level"></alias>
+        <alias field="minimum_optimal_scale" index="9" name="Minimum optimal scale"></alias>
+        <alias field="maximum_optimal_scale" index="10" name="Maximum optimal scale"></alias>
+        <alias field="publication_date" index="11" name="Date of publication"></alias>
+        <alias field="publication_frequency" index="12" name="Publication frequency"></alias>
+        <alias field="license" index="13" name="License"></alias>
+        <alias field="confidentiality" index="14" name="Confidentiality"></alias>
+        <alias field="feature_count" index="15" name="Feature count"></alias>
+        <alias field="geometry_type" index="16" name="Geometry type"></alias>
+        <alias field="projection_name" index="17" name="Projection name"></alias>
+        <alias field="projection_authid" index="18" name="Projection auth Id"></alias>
+        <alias field="spatial_extent" index="19" name="Spatial extent"></alias>
+        <alias field="creation_date" index="20" name="Created at"></alias>
+        <alias field="update_date" index="21" name="Last updated at"></alias>
+        <alias field="data_last_update" index="22" name="Data last update"></alias>
+        <alias field="themes" index="23" name="Themes"></alias>
+        <alias field="license_attribution" index="24" name="License attribution"></alias>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="uid" applyOnUpdate="0"/>
-        <default expression="" field="table_name" applyOnUpdate="0"/>
-        <default expression="" field="schema_name" applyOnUpdate="0"/>
-        <default expression="" field="title" applyOnUpdate="0"/>
-        <default expression="" field="abstract" applyOnUpdate="0"/>
-        <default expression="" field="categories" applyOnUpdate="0"/>
-        <default expression="" field="keywords" applyOnUpdate="0"/>
-        <default expression="" field="spatial_level" applyOnUpdate="0"/>
-        <default expression="" field="minimum_optimal_scale" applyOnUpdate="0"/>
-        <default expression="" field="maximum_optimal_scale" applyOnUpdate="0"/>
-        <default expression="" field="publication_date" applyOnUpdate="0"/>
-        <default expression="" field="publication_frequency" applyOnUpdate="0"/>
-        <default expression="" field="license" applyOnUpdate="0"/>
-        <default expression="" field="license_attribution" applyOnUpdate="0"/>
-        <default expression="" field="confidentiality" applyOnUpdate="0"/>
-        <default expression="" field="feature_count" applyOnUpdate="0"/>
-        <default expression="" field="geometry_type" applyOnUpdate="0"/>
-        <default expression="" field="projection_name" applyOnUpdate="0"/>
-        <default expression="" field="projection_authid" applyOnUpdate="0"/>
-        <default expression="" field="spatial_extent" applyOnUpdate="0"/>
-        <default expression="now()" field="creation_date" applyOnUpdate="0"/>
-        <default expression="now()" field="update_date" applyOnUpdate="1"/>
-        <default expression="" field="data_last_update" applyOnUpdate="0"/>
-        <default expression="" field="themes" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"></default>
+        <default applyOnUpdate="0" expression="" field="uid"></default>
+        <default applyOnUpdate="0" expression="" field="table_name"></default>
+        <default applyOnUpdate="0" expression="" field="schema_name"></default>
+        <default applyOnUpdate="0" expression="" field="title"></default>
+        <default applyOnUpdate="0" expression="" field="abstract"></default>
+        <default applyOnUpdate="0" expression="" field="categories"></default>
+        <default applyOnUpdate="0" expression="" field="keywords"></default>
+        <default applyOnUpdate="0" expression="" field="spatial_level"></default>
+        <default applyOnUpdate="0" expression="" field="minimum_optimal_scale"></default>
+        <default applyOnUpdate="0" expression="" field="maximum_optimal_scale"></default>
+        <default applyOnUpdate="0" expression="" field="publication_date"></default>
+        <default applyOnUpdate="0" expression="" field="publication_frequency"></default>
+        <default applyOnUpdate="0" expression="" field="license"></default>
+        <default applyOnUpdate="0" expression="" field="confidentiality"></default>
+        <default applyOnUpdate="0" expression="" field="feature_count"></default>
+        <default applyOnUpdate="0" expression="" field="geometry_type"></default>
+        <default applyOnUpdate="0" expression="" field="projection_name"></default>
+        <default applyOnUpdate="0" expression="" field="projection_authid"></default>
+        <default applyOnUpdate="0" expression="" field="spatial_extent"></default>
+        <default applyOnUpdate="0" expression="now()" field="creation_date"></default>
+        <default applyOnUpdate="1" expression="now()" field="update_date"></default>
+        <default applyOnUpdate="0" expression="" field="data_last_update"></default>
+        <default applyOnUpdate="0" expression="" field="themes"></default>
+        <default applyOnUpdate="0" expression="" field="license_attribution"></default>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" constraints="3" field="id" exp_strength="0" notnull_strength="2"/>
-        <constraint unique_strength="1" constraints="3" field="uid" exp_strength="0" notnull_strength="2"/>
-        <constraint unique_strength="0" constraints="1" field="table_name" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="1" field="schema_name" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="1" field="title" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="1" field="abstract" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="0" field="categories" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="keywords" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="spatial_level" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="minimum_optimal_scale" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="maximum_optimal_scale" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="publication_date" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="publication_frequency" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="license" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="license_attribution" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="confidentiality" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="feature_count" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="geometry_type" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="projection_name" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="projection_authid" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="spatial_extent" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="1" field="creation_date" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="0" field="update_date" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="data_last_update" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="themes" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="3" exp_strength="0" field="id" notnull_strength="2" unique_strength="1"></constraint>
+        <constraint constraints="3" exp_strength="0" field="uid" notnull_strength="2" unique_strength="1"></constraint>
+        <constraint constraints="1" exp_strength="0" field="table_name" notnull_strength="1" unique_strength="0"></constraint>
+        <constraint constraints="1" exp_strength="0" field="schema_name" notnull_strength="1" unique_strength="0"></constraint>
+        <constraint constraints="1" exp_strength="0" field="title" notnull_strength="1" unique_strength="0"></constraint>
+        <constraint constraints="1" exp_strength="0" field="abstract" notnull_strength="1" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="categories" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="keywords" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="spatial_level" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="minimum_optimal_scale" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="maximum_optimal_scale" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="publication_date" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="publication_frequency" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="license" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="confidentiality" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="feature_count" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="geometry_type" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="projection_name" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="projection_authid" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="spatial_extent" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="1" exp_strength="0" field="creation_date" notnull_strength="1" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="update_date" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="data_last_update" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="themes" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="license_attribution" notnull_strength="0" unique_strength="0"></constraint>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="uid" desc="" exp=""/>
-        <constraint field="table_name" desc="" exp=""/>
-        <constraint field="schema_name" desc="" exp=""/>
-        <constraint field="title" desc="" exp=""/>
-        <constraint field="abstract" desc="" exp=""/>
-        <constraint field="categories" desc="" exp=""/>
-        <constraint field="keywords" desc="" exp=""/>
-        <constraint field="spatial_level" desc="" exp=""/>
-        <constraint field="minimum_optimal_scale" desc="" exp=""/>
-        <constraint field="maximum_optimal_scale" desc="" exp=""/>
-        <constraint field="publication_date" desc="" exp=""/>
-        <constraint field="publication_frequency" desc="" exp=""/>
-        <constraint field="license" desc="" exp=""/>
-        <constraint field="license_attribution" desc="" exp=""/>
-        <constraint field="confidentiality" desc="" exp=""/>
-        <constraint field="feature_count" desc="" exp=""/>
-        <constraint field="geometry_type" desc="" exp=""/>
-        <constraint field="projection_name" desc="" exp=""/>
-        <constraint field="projection_authid" desc="" exp=""/>
-        <constraint field="spatial_extent" desc="" exp=""/>
-        <constraint field="creation_date" desc="" exp=""/>
-        <constraint field="update_date" desc="" exp=""/>
-        <constraint field="data_last_update" desc="" exp=""/>
-        <constraint field="themes" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"></constraint>
+        <constraint desc="" exp="" field="uid"></constraint>
+        <constraint desc="" exp="" field="table_name"></constraint>
+        <constraint desc="" exp="" field="schema_name"></constraint>
+        <constraint desc="" exp="" field="title"></constraint>
+        <constraint desc="" exp="" field="abstract"></constraint>
+        <constraint desc="" exp="" field="categories"></constraint>
+        <constraint desc="" exp="" field="keywords"></constraint>
+        <constraint desc="" exp="" field="spatial_level"></constraint>
+        <constraint desc="" exp="" field="minimum_optimal_scale"></constraint>
+        <constraint desc="" exp="" field="maximum_optimal_scale"></constraint>
+        <constraint desc="" exp="" field="publication_date"></constraint>
+        <constraint desc="" exp="" field="publication_frequency"></constraint>
+        <constraint desc="" exp="" field="license"></constraint>
+        <constraint desc="" exp="" field="confidentiality"></constraint>
+        <constraint desc="" exp="" field="feature_count"></constraint>
+        <constraint desc="" exp="" field="geometry_type"></constraint>
+        <constraint desc="" exp="" field="projection_name"></constraint>
+        <constraint desc="" exp="" field="projection_authid"></constraint>
+        <constraint desc="" exp="" field="spatial_extent"></constraint>
+        <constraint desc="" exp="" field="creation_date"></constraint>
+        <constraint desc="" exp="" field="update_date"></constraint>
+        <constraint desc="" exp="" field="data_last_update"></constraint>
+        <constraint desc="" exp="" field="themes"></constraint>
+        <constraint desc="" exp="" field="license_attribution"></constraint>
       </constraintExpressions>
-      <expressionfields/>
+      <expressionfields></expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"></defaultAction>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="uid" width="-1" hidden="0"/>
-          <column type="field" name="table_name" width="-1" hidden="0"/>
-          <column type="field" name="schema_name" width="-1" hidden="0"/>
-          <column type="field" name="title" width="-1" hidden="0"/>
-          <column type="field" name="abstract" width="-1" hidden="0"/>
-          <column type="field" name="categories" width="-1" hidden="0"/>
-          <column type="field" name="keywords" width="-1" hidden="0"/>
-          <column type="field" name="spatial_level" width="-1" hidden="0"/>
-          <column type="field" name="minimum_optimal_scale" width="-1" hidden="0"/>
-          <column type="field" name="maximum_optimal_scale" width="-1" hidden="0"/>
-          <column type="field" name="publication_date" width="-1" hidden="0"/>
-          <column type="field" name="publication_frequency" width="-1" hidden="0"/>
-          <column type="field" name="license" width="-1" hidden="0"/>
-          <column type="field" name="license_attribution" width="-1" hidden="0"/>
-          <column type="field" name="confidentiality" width="-1" hidden="0"/>
-          <column type="field" name="feature_count" width="-1" hidden="0"/>
-          <column type="field" name="geometry_type" width="-1" hidden="0"/>
-          <column type="field" name="projection_name" width="-1" hidden="0"/>
-          <column type="field" name="projection_authid" width="-1" hidden="0"/>
-          <column type="field" name="spatial_extent" width="-1" hidden="0"/>
-          <column type="field" name="creation_date" width="-1" hidden="0"/>
-          <column type="field" name="update_date" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="data_last_update" width="-1" hidden="0"/>
-          <column type="field" name="themes" width="-1" hidden="0"/>
+          <column hidden="0" name="id" type="field" width="-1"></column>
+          <column hidden="0" name="uid" type="field" width="-1"></column>
+          <column hidden="0" name="table_name" type="field" width="-1"></column>
+          <column hidden="0" name="schema_name" type="field" width="-1"></column>
+          <column hidden="0" name="title" type="field" width="-1"></column>
+          <column hidden="0" name="abstract" type="field" width="-1"></column>
+          <column hidden="0" name="categories" type="field" width="-1"></column>
+          <column hidden="0" name="keywords" type="field" width="-1"></column>
+          <column hidden="0" name="spatial_level" type="field" width="-1"></column>
+          <column hidden="0" name="minimum_optimal_scale" type="field" width="-1"></column>
+          <column hidden="0" name="maximum_optimal_scale" type="field" width="-1"></column>
+          <column hidden="0" name="publication_date" type="field" width="-1"></column>
+          <column hidden="0" name="publication_frequency" type="field" width="-1"></column>
+          <column hidden="0" name="license" type="field" width="-1"></column>
+          <column hidden="0" name="license_attribution" type="field" width="-1"></column>
+          <column hidden="0" name="confidentiality" type="field" width="-1"></column>
+          <column hidden="0" name="feature_count" type="field" width="-1"></column>
+          <column hidden="0" name="geometry_type" type="field" width="-1"></column>
+          <column hidden="0" name="projection_name" type="field" width="-1"></column>
+          <column hidden="0" name="projection_authid" type="field" width="-1"></column>
+          <column hidden="0" name="spatial_extent" type="field" width="-1"></column>
+          <column hidden="0" name="creation_date" type="field" width="-1"></column>
+          <column hidden="0" name="update_date" type="field" width="-1"></column>
+          <column hidden="1" type="actions" width="-1"></column>
+          <column hidden="0" name="data_last_update" type="field" width="-1"></column>
+          <column hidden="0" name="themes" type="field" width="-1"></column>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
+        <rowstyles></rowstyles>
+        <fieldstyles></fieldstyles>
       </conditionalstyles>
-      <storedexpressions/>
+      <storedexpressions></storedexpressions>
       <editform tolerant="1"></editform>
-      <editforminit/>
+      <editforminit></editforminit>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+      <editforminitcode># -*- coding: utf-8 -*-
 """
 QGIS forms can have a Python function that is called when the form is
 opened.
@@ -1302,131 +1486,140 @@ from qgis.PyQt.QtWidgets import QWidget
 def my_form_open(dialog, layer, feature):
 	geom = feature.geometry()
 	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
+</editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>tablayout</editorlayout>
       <attributeEditorForm>
-        <attributeEditorField name="schema_name" index="3" showLabel="1"/>
-        <attributeEditorField name="table_name" index="2" showLabel="1"/>
-        <attributeEditorContainer groupBox="0" name="Properties" visibilityExpressionEnabled="0" showLabel="1" columnCount="1" visibilityExpression="">
-          <attributeEditorContainer groupBox="1" name="Identification" visibilityExpressionEnabled="0" showLabel="1" columnCount="1" visibilityExpression="">
-            <attributeEditorField name="id" index="0" showLabel="1"/>
-            <attributeEditorField name="uid" index="1" showLabel="1"/>
-            <attributeEditorField name="title" index="4" showLabel="1"/>
-            <attributeEditorField name="abstract" index="5" showLabel="1"/>
-            <attributeEditorField name="categories" index="6" showLabel="1"/>
-            <attributeEditorField name="themes" index="23" showLabel="1"/>
-            <attributeEditorField name="keywords" index="7" showLabel="1"/>
-            <attributeEditorField name="data_last_update" index="22" showLabel="1"/>
+        <attributeEditorField index="3" name="schema_name" showLabel="1"></attributeEditorField>
+        <attributeEditorField index="2" name="table_name" showLabel="1"></attributeEditorField>
+        <attributeEditorContainer columnCount="1" groupBox="0" name="Properties" showLabel="1" visibilityExpression="" visibilityExpressionEnabled="0">
+          <attributeEditorContainer columnCount="1" groupBox="1" name="Identification" showLabel="1" visibilityExpression="" visibilityExpressionEnabled="0">
+            <attributeEditorField index="0" name="id" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="1" name="uid" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="4" name="title" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="5" name="abstract" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="6" name="categories" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="23" name="themes" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="7" name="keywords" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="22" name="data_last_update" showLabel="1"></attributeEditorField>
           </attributeEditorContainer>
-          <attributeEditorContainer groupBox="1" name="Publication" visibilityExpressionEnabled="0" showLabel="1" columnCount="1" visibilityExpression="">
-            <attributeEditorField name="publication_date" index="11" showLabel="1"/>
-            <attributeEditorField name="publication_frequency" index="12" showLabel="1"/>
-            <attributeEditorField name="license" index="13" showLabel="1"/>
-            <attributeEditorField name="license_attribution" index="24" showLabel="1"/>
-            <attributeEditorField name="confidentiality" index="14" showLabel="1"/>
+          <attributeEditorContainer columnCount="1" groupBox="1" name="Publication" showLabel="1" visibilityExpression="" visibilityExpressionEnabled="0">
+            <attributeEditorField index="11" name="publication_date" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="12" name="publication_frequency" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="13" name="license" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="24" name="license_attribution" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="14" name="confidentiality" showLabel="1"></attributeEditorField>
           </attributeEditorContainer>
-          <attributeEditorContainer groupBox="1" name="Spatial properties" visibilityExpressionEnabled="0" showLabel="1" columnCount="1" visibilityExpression="">
-            <attributeEditorField name="spatial_level" index="8" showLabel="1"/>
-            <attributeEditorField name="minimum_optimal_scale" index="9" showLabel="1"/>
-            <attributeEditorField name="maximum_optimal_scale" index="10" showLabel="1"/>
-            <attributeEditorField name="spatial_extent" index="19" showLabel="1"/>
-            <attributeEditorField name="projection_name" index="17" showLabel="1"/>
-            <attributeEditorField name="projection_authid" index="18" showLabel="1"/>
-            <attributeEditorField name="geometry_type" index="16" showLabel="1"/>
-            <attributeEditorField name="feature_count" index="15" showLabel="1"/>
+          <attributeEditorContainer columnCount="1" groupBox="1" name="Spatial properties" showLabel="1" visibilityExpression="" visibilityExpressionEnabled="0">
+            <attributeEditorField index="8" name="spatial_level" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="9" name="minimum_optimal_scale" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="10" name="maximum_optimal_scale" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="19" name="spatial_extent" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="17" name="projection_name" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="18" name="projection_authid" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="16" name="geometry_type" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="15" name="feature_count" showLabel="1"></attributeEditorField>
           </attributeEditorContainer>
-          <attributeEditorContainer groupBox="1" name="Metadata" visibilityExpressionEnabled="0" showLabel="1" columnCount="1" visibilityExpression="">
-            <attributeEditorField name="creation_date" index="20" showLabel="1"/>
-            <attributeEditorField name="update_date" index="21" showLabel="1"/>
+          <attributeEditorContainer columnCount="1" groupBox="1" name="Metadata" showLabel="1" visibilityExpression="" visibilityExpressionEnabled="0">
+            <attributeEditorField index="20" name="creation_date" showLabel="1"></attributeEditorField>
+            <attributeEditorField index="21" name="update_date" showLabel="1"></attributeEditorField>
           </attributeEditorContainer>
         </attributeEditorContainer>
-        <attributeEditorContainer groupBox="0" name="Contacts" visibilityExpressionEnabled="0" showLabel="1" columnCount="1" visibilityExpression="">
-          <attributeEditorRelation relation="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id" nmRelationId="" name="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id" forceSuppressFormPopup="0" buttons="AllButtons" showLabel="1" label=""/>
+        <attributeEditorContainer columnCount="1" groupBox="0" name="Contacts" showLabel="1" visibilityExpression="" visibilityExpressionEnabled="0">
+          <attributeEditorRelation forceSuppressFormPopup="0" label="" name="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id" nmRelationId="" relation="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id" relationWidgetTypeId="" showLabel="1">
+            <editor_configuration type="Map">
+              <Option name="buttons" type="QString" value="AllButtons"></Option>
+            </editor_configuration>
+          </attributeEditorRelation>
         </attributeEditorContainer>
-        <attributeEditorContainer groupBox="0" name="Links" visibilityExpressionEnabled="0" showLabel="1" columnCount="1" visibilityExpression="">
-          <attributeEditorRelation relation="link_6157b282_9882_44f3_b6a1_c133f5595d2a_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id" nmRelationId="" name="link_6157b282_9882_44f3_b6a1_c133f5595d2a_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id" forceSuppressFormPopup="0" buttons="AllButtons" showLabel="1" label=""/>
+        <attributeEditorContainer columnCount="1" groupBox="0" name="Links" showLabel="1" visibilityExpression="" visibilityExpressionEnabled="0">
+          <attributeEditorRelation forceSuppressFormPopup="0" label="" name="link_6157b282_9882_44f3_b6a1_c133f5595d2a_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id" nmRelationId="" relation="link_6157b282_9882_44f3_b6a1_c133f5595d2a_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id" relationWidgetTypeId="" showLabel="1">
+            <editor_configuration type="Map">
+              <Option name="buttons" type="QString" value="AllButtons"></Option>
+            </editor_configuration>
+          </attributeEditorRelation>
         </attributeEditorContainer>
       </attributeEditorForm>
       <editable>
-        <field editable="1" name="abstract"/>
-        <field editable="1" name="categories"/>
-        <field editable="1" name="confidentiality"/>
-        <field editable="0" name="creation_date"/>
-        <field editable="1" name="data_last_update"/>
-        <field editable="0" name="feature_count"/>
-        <field editable="0" name="geometry_type"/>
-        <field editable="0" name="id"/>
-        <field editable="1" name="keywords"/>
-        <field editable="1" name="license"/>
-        <field editable="1" name="license_attribution"/>
-        <field editable="1" name="maximum_optimal_scale"/>
-        <field editable="1" name="minimum_optimal_scale"/>
-        <field editable="0" name="projection_authid"/>
-        <field editable="0" name="projection_name"/>
-        <field editable="1" name="publication_date"/>
-        <field editable="1" name="publication_frequency"/>
-        <field editable="1" name="schema_name"/>
-        <field editable="0" name="spatial_extent"/>
-        <field editable="1" name="spatial_level"/>
-        <field editable="1" name="table_name"/>
-        <field editable="1" name="theme"/>
-        <field editable="1" name="themes"/>
-        <field editable="1" name="title"/>
-        <field editable="0" name="uid"/>
-        <field editable="0" name="update_date"/>
+        <field editable="1" name="abstract"></field>
+        <field editable="1" name="categories"></field>
+        <field editable="1" name="confidentiality"></field>
+        <field editable="0" name="creation_date"></field>
+        <field editable="1" name="data_last_update"></field>
+        <field editable="0" name="feature_count"></field>
+        <field editable="0" name="geometry_type"></field>
+        <field editable="0" name="id"></field>
+        <field editable="1" name="keywords"></field>
+        <field editable="1" name="license"></field>
+        <field editable="1" name="license_attribution"></field>
+        <field editable="1" name="maximum_optimal_scale"></field>
+        <field editable="1" name="minimum_optimal_scale"></field>
+        <field editable="0" name="projection_authid"></field>
+        <field editable="0" name="projection_name"></field>
+        <field editable="1" name="publication_date"></field>
+        <field editable="1" name="publication_frequency"></field>
+        <field editable="1" name="schema_name"></field>
+        <field editable="0" name="spatial_extent"></field>
+        <field editable="1" name="spatial_level"></field>
+        <field editable="1" name="table_name"></field>
+        <field editable="1" name="theme"></field>
+        <field editable="1" name="themes"></field>
+        <field editable="1" name="title"></field>
+        <field editable="0" name="uid"></field>
+        <field editable="0" name="update_date"></field>
       </editable>
       <labelOnTop>
-        <field name="abstract" labelOnTop="0"/>
-        <field name="categories" labelOnTop="0"/>
-        <field name="confidentiality" labelOnTop="0"/>
-        <field name="creation_date" labelOnTop="0"/>
-        <field name="data_last_update" labelOnTop="0"/>
-        <field name="feature_count" labelOnTop="0"/>
-        <field name="geometry_type" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="keywords" labelOnTop="0"/>
-        <field name="license" labelOnTop="0"/>
-        <field name="license_attribution" labelOnTop="0"/>
-        <field name="maximum_optimal_scale" labelOnTop="0"/>
-        <field name="minimum_optimal_scale" labelOnTop="0"/>
-        <field name="projection_authid" labelOnTop="0"/>
-        <field name="projection_name" labelOnTop="0"/>
-        <field name="publication_date" labelOnTop="0"/>
-        <field name="publication_frequency" labelOnTop="0"/>
-        <field name="schema_name" labelOnTop="0"/>
-        <field name="spatial_extent" labelOnTop="0"/>
-        <field name="spatial_level" labelOnTop="0"/>
-        <field name="table_name" labelOnTop="0"/>
-        <field name="theme" labelOnTop="0"/>
-        <field name="themes" labelOnTop="0"/>
-        <field name="title" labelOnTop="0"/>
-        <field name="uid" labelOnTop="0"/>
-        <field name="update_date" labelOnTop="0"/>
+        <field labelOnTop="0" name="abstract"></field>
+        <field labelOnTop="0" name="categories"></field>
+        <field labelOnTop="0" name="confidentiality"></field>
+        <field labelOnTop="0" name="creation_date"></field>
+        <field labelOnTop="0" name="data_last_update"></field>
+        <field labelOnTop="0" name="feature_count"></field>
+        <field labelOnTop="0" name="geometry_type"></field>
+        <field labelOnTop="0" name="id"></field>
+        <field labelOnTop="0" name="keywords"></field>
+        <field labelOnTop="0" name="license"></field>
+        <field labelOnTop="0" name="license_attribution"></field>
+        <field labelOnTop="0" name="maximum_optimal_scale"></field>
+        <field labelOnTop="0" name="minimum_optimal_scale"></field>
+        <field labelOnTop="0" name="projection_authid"></field>
+        <field labelOnTop="0" name="projection_name"></field>
+        <field labelOnTop="0" name="publication_date"></field>
+        <field labelOnTop="0" name="publication_frequency"></field>
+        <field labelOnTop="0" name="schema_name"></field>
+        <field labelOnTop="0" name="spatial_extent"></field>
+        <field labelOnTop="0" name="spatial_level"></field>
+        <field labelOnTop="0" name="table_name"></field>
+        <field labelOnTop="0" name="theme"></field>
+        <field labelOnTop="0" name="themes"></field>
+        <field labelOnTop="0" name="title"></field>
+        <field labelOnTop="0" name="uid"></field>
+        <field labelOnTop="0" name="update_date"></field>
       </labelOnTop>
-      <dataDefinedFieldProperties/>
+      <reuseLastValue></reuseLastValue>
+      <dataDefinedFieldProperties></dataDefinedFieldProperties>
       <widgets>
         <widget name="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id">
           <config type="Map">
-            <Option type="QString" value="" name="nm-rel"/>
+            <Option name="nm-rel" type="QString" value=""></Option>
           </config>
         </widget>
         <widget name="link_6157b282_9882_44f3_b6a1_c133f5595d2a_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id">
           <config type="Map">
-            <Option type="QString" value="" name="nm-rel"/>
+            <Option name="nm-rel" type="QString" value=""></Option>
           </config>
         </widget>
       </widgets>
       <previewExpression>concat("schema_name", '.', "table_name")</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" readOnly="0" type="vector" refreshOnNotifyEnabled="0" geometry="No geometry" maxScale="0" autoRefreshTime="0" wkbType="NoGeometry" styleCategories="AllStyleCategories" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" geometry="No geometry" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" maxScale="0" minScale="1e+08" readOnly="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" type="vector" wkbType="NoGeometry">
       <id>dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675</id>
       <datasource>service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table="pgmetadata"."dataset_contact"</datasource>
       <keywordList>
         <value></value>
       </keywordList>
-      <layername>Dataset &lt;-> Contact</layername>
+      <layername>Dataset &lt;-&gt; Contact</layername>
       <srs>
         <spatialrefsys>
           <wkt></wkt>
@@ -1456,7 +1649,7 @@ def my_form_open(dialog, layer, feature):
           <email></email>
           <role></role>
         </contact>
-        <links/>
+        <links></links>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -1473,7 +1666,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxx="0" dimensions="2" crs="" miny="0" maxz="0" minz="0" minx="0" maxy="0"/>
+          <spatial crs="" dimensions="2" maxx="0" maxy="0" maxz="0" minx="0" miny="0" minz="0"></spatial>
           <temporal>
             <period>
               <start></start>
@@ -1483,155 +1676,159 @@ def my_form_open(dialog, layer, feature):
         </extent>
       </resourceMetadata>
       <provider encoding="">postgres</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
+      <vectorjoins></vectorjoins>
+      <layerDependencies></layerDependencies>
+      <dataDependencies></dataDependencies>
+      <expressionfields></expressionfields>
       <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
+        <map-layer-style name="default"></map-layer-style>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
+      <auxiliaryLayer></auxiliaryLayer>
+      <metadataUrls></metadataUrls>
       <flags>
         <Identifiable>1</Identifiable>
         <Removable>1</Removable>
         <Searchable>1</Searchable>
+        <Private>0</Private>
       </flags>
-      <temporal endExpression="" startField="" startExpression="" enabled="0" fixedDuration="0" accumulate="0" durationUnit="min" mode="0" endField="" durationField="">
+      <temporal accumulate="0" durationField="" durationUnit="min" enabled="0" endExpression="" endField="" fixedDuration="0" limitMode="0" mode="0" startExpression="" startField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
       <customproperties>
-        <property value="&quot;id&quot;" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
+        <Option type="Map">
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"></Option>
+          <Option name="embeddedWidgets/count" type="QString" value="0"></Option>
+          <Option name="variableNames"></Option>
+          <Option name="variableValues"></Option>
+        </Option>
       </customproperties>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+        <activeChecks></activeChecks>
+        <checkConfiguration></checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector"/>
+      <legend showLabelLegend="0" type="default-vector"></legend>
       <referencedLayers>
-        <relation layerName="Contact" name="dataset_contact_fk_id_contact_fkey" strength="Association" dataSource="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;contact&quot;" referencingLayer="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675" referencedLayer="contact_640d326a_25a7_4b9c_8878_42d1201a8198" providerKey="postgres" id="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675_fk_id_contact_contact_640d326a_25a7_4b9c_8878_42d1201a8198_id" layerId="contact_640d326a_25a7_4b9c_8878_42d1201a8198">
-          <fieldRef referencedField="id" referencingField="fk_id_contact"/>
+        <relation dataSource="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;contact&quot;" id="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675_fk_id_contact_contact_640d326a_25a7_4b9c_8878_42d1201a8198_id" layerId="contact_640d326a_25a7_4b9c_8878_42d1201a8198" layerName="Contact" name="dataset_contact_fk_id_contact_fkey" providerKey="postgres" referencedLayer="contact_640d326a_25a7_4b9c_8878_42d1201a8198" referencingLayer="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675" strength="Association">
+          <fieldRef referencedField="id" referencingField="fk_id_contact"></fieldRef>
         </relation>
-        <relation layerName="Dataset" name="dataset_contact_fk_id_dataset_fkey" strength="Association" dataSource="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true srid=4326 type=Polygon checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;dataset&quot; (geom)" referencingLayer="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675" referencedLayer="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd" providerKey="postgres" id="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id" layerId="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd">
-          <fieldRef referencedField="id" referencingField="fk_id_dataset"/>
+        <relation dataSource="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true srid=4326 type=Polygon checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;dataset&quot; (geom)" id="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id" layerId="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd" layerName="Dataset" name="dataset_contact_fk_id_dataset_fkey" providerKey="postgres" referencedLayer="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd" referencingLayer="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675" strength="Association">
+          <fieldRef referencedField="id" referencingField="fk_id_dataset"></fieldRef>
         </relation>
       </referencedLayers>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="fk_id_contact" configurationFlags="None">
+        <field configurationFlags="None" name="fk_id_contact">
           <editWidget type="RelationReference">
             <config>
               <Option type="Map">
-                <Option type="bool" value="true" name="AllowAddFeatures"/>
-                <Option type="bool" value="false" name="AllowNULL"/>
-                <Option type="bool" value="false" name="MapIdentification"/>
-                <Option type="bool" value="true" name="OrderByValue"/>
-                <Option type="bool" value="false" name="ReadOnly"/>
-                <Option type="QString" value="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675_fk_id_contact_contact_640d326a_25a7_4b9c_8878_42d1201a8198_id" name="Relation"/>
-                <Option type="bool" value="false" name="ShowForm"/>
-                <Option type="bool" value="false" name="ShowOpenFormButton"/>
+                <Option name="AllowAddFeatures" type="bool" value="true"></Option>
+                <Option name="AllowNULL" type="bool" value="false"></Option>
+                <Option name="MapIdentification" type="bool" value="false"></Option>
+                <Option name="OrderByValue" type="bool" value="true"></Option>
+                <Option name="ReadOnly" type="bool" value="false"></Option>
+                <Option name="Relation" type="QString" value="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675_fk_id_contact_contact_640d326a_25a7_4b9c_8878_42d1201a8198_id"></Option>
+                <Option name="ShowForm" type="bool" value="false"></Option>
+                <Option name="ShowOpenFormButton" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="fk_id_dataset" configurationFlags="None">
+        <field configurationFlags="None" name="fk_id_dataset">
           <editWidget type="RelationReference">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="AllowAddFeatures"/>
-                <Option type="bool" value="false" name="AllowNULL"/>
-                <Option type="bool" value="false" name="MapIdentification"/>
-                <Option type="bool" value="true" name="OrderByValue"/>
-                <Option type="bool" value="false" name="ReadOnly"/>
-                <Option type="QString" value="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id" name="Relation"/>
-                <Option type="bool" value="false" name="ShowForm"/>
-                <Option type="bool" value="false" name="ShowOpenFormButton"/>
+                <Option name="AllowAddFeatures" type="bool" value="false"></Option>
+                <Option name="AllowNULL" type="bool" value="false"></Option>
+                <Option name="MapIdentification" type="bool" value="false"></Option>
+                <Option name="OrderByValue" type="bool" value="true"></Option>
+                <Option name="ReadOnly" type="bool" value="false"></Option>
+                <Option name="Relation" type="QString" value="dataset_contact_ff2bb406_5b18_4ab7_9fc0_3a25c3aa9675_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id"></Option>
+                <Option name="ShowForm" type="bool" value="false"></Option>
+                <Option name="ShowOpenFormButton" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="contact_role" configurationFlags="None">
+        <field configurationFlags="None" name="contact_role">
           <editWidget type="ValueRelation">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="AllowMulti"/>
-                <Option type="bool" value="true" name="AllowNull"/>
-                <Option type="QString" value="&quot;field&quot; = 'contact.contact_role'" name="FilterExpression"/>
-                <Option type="QString" value="code" name="Key"/>
-                <Option type="QString" value="glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab" name="Layer"/>
-                <Option type="QString" value="glossary" name="LayerName"/>
-                <Option type="QString" value="postgres" name="LayerProviderName"/>
-                <Option type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable key='tid' estimatedmetadata=false checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;glossary&quot; sql=" name="LayerSource"/>
-                <Option type="int" value="1" name="NofColumns"/>
-                <Option type="bool" value="true" name="OrderByValue"/>
-                <Option type="bool" value="false" name="UseCompleter"/>
-                <Option type="QString" value="label_en" name="Value"/>
+                <Option name="AllowMulti" type="bool" value="false"></Option>
+                <Option name="AllowNull" type="bool" value="true"></Option>
+                <Option name="FilterExpression" type="QString" value="&quot;field&quot; = 'contact.contact_role'"></Option>
+                <Option name="Key" type="QString" value="code"></Option>
+                <Option name="Layer" type="QString" value="glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab"></Option>
+                <Option name="LayerName" type="QString" value="glossary"></Option>
+                <Option name="LayerProviderName" type="QString" value="postgres"></Option>
+                <Option name="LayerSource" type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable estimatedmetadata=true sslmode=disable key='tid' estimatedmetadata=false checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;glossary&quot; sql="></Option>
+                <Option name="NofColumns" type="int" value="1"></Option>
+                <Option name="OrderByValue" type="bool" value="true"></Option>
+                <Option name="UseCompleter" type="bool" value="false"></Option>
+                <Option name="Value" type="QString" value="label_en"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="Id" index="0"/>
-        <alias field="fk_id_contact" name="Contact" index="1"/>
-        <alias field="fk_id_dataset" name="Dataset" index="2"/>
-        <alias field="contact_role" name="Role" index="3"/>
+        <alias field="id" index="0" name="Id"></alias>
+        <alias field="fk_id_contact" index="1" name="Contact"></alias>
+        <alias field="fk_id_dataset" index="2" name="Dataset"></alias>
+        <alias field="contact_role" index="3" name="Role"></alias>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="fk_id_contact" applyOnUpdate="0"/>
-        <default expression="" field="fk_id_dataset" applyOnUpdate="0"/>
-        <default expression="" field="contact_role" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"></default>
+        <default applyOnUpdate="0" expression="" field="fk_id_contact"></default>
+        <default applyOnUpdate="0" expression="" field="fk_id_dataset"></default>
+        <default applyOnUpdate="0" expression="" field="contact_role"></default>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" constraints="3" field="id" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="1" field="fk_id_contact" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="1" field="fk_id_dataset" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="1" field="contact_role" exp_strength="0" notnull_strength="1"/>
+        <constraint constraints="3" exp_strength="0" field="id" notnull_strength="1" unique_strength="1"></constraint>
+        <constraint constraints="1" exp_strength="0" field="fk_id_contact" notnull_strength="1" unique_strength="0"></constraint>
+        <constraint constraints="1" exp_strength="0" field="fk_id_dataset" notnull_strength="1" unique_strength="0"></constraint>
+        <constraint constraints="1" exp_strength="0" field="contact_role" notnull_strength="1" unique_strength="0"></constraint>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="fk_id_contact" desc="" exp=""/>
-        <constraint field="fk_id_dataset" desc="" exp=""/>
-        <constraint field="contact_role" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"></constraint>
+        <constraint desc="" exp="" field="fk_id_contact"></constraint>
+        <constraint desc="" exp="" field="fk_id_dataset"></constraint>
+        <constraint desc="" exp="" field="contact_role"></constraint>
       </constraintExpressions>
-      <expressionfields/>
+      <expressionfields></expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"></defaultAction>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="fk_id_contact" width="-1" hidden="0"/>
-          <column type="field" name="fk_id_dataset" width="-1" hidden="0"/>
-          <column type="field" name="contact_role" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" name="id" type="field" width="-1"></column>
+          <column hidden="0" name="fk_id_contact" type="field" width="-1"></column>
+          <column hidden="0" name="fk_id_dataset" type="field" width="-1"></column>
+          <column hidden="0" name="contact_role" type="field" width="-1"></column>
+          <column hidden="1" type="actions" width="-1"></column>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
+        <rowstyles></rowstyles>
+        <fieldstyles></fieldstyles>
       </conditionalstyles>
-      <storedexpressions/>
+      <storedexpressions></storedexpressions>
       <editform tolerant="1"></editform>
-      <editforminit/>
+      <editforminit></editforminit>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+      <editforminitcode># -*- coding: utf-8 -*-
 """
 QGIS forms can have a Python function that is called when the form is
 opened.
@@ -1647,27 +1844,28 @@ from qgis.PyQt.QtWidgets import QWidget
 def my_form_open(dialog, layer, feature):
 	geom = feature.geometry()
 	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
+</editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="contact_role"/>
-        <field editable="1" name="fk_id_contact"/>
-        <field editable="1" name="fk_id_dataset"/>
-        <field editable="0" name="id"/>
+        <field editable="1" name="contact_role"></field>
+        <field editable="1" name="fk_id_contact"></field>
+        <field editable="1" name="fk_id_dataset"></field>
+        <field editable="0" name="id"></field>
       </editable>
       <labelOnTop>
-        <field name="contact_role" labelOnTop="0"/>
-        <field name="fk_id_contact" labelOnTop="0"/>
-        <field name="fk_id_dataset" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="contact_role"></field>
+        <field labelOnTop="0" name="fk_id_contact"></field>
+        <field labelOnTop="0" name="fk_id_dataset"></field>
+        <field labelOnTop="0" name="id"></field>
       </labelOnTop>
-      <dataDefinedFieldProperties/>
-      <widgets/>
+      <reuseLastValue></reuseLastValue>
+      <dataDefinedFieldProperties></dataDefinedFieldProperties>
+      <widgets></widgets>
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" readOnly="0" type="vector" refreshOnNotifyEnabled="0" geometry="No geometry" maxScale="0" autoRefreshTime="0" wkbType="NoGeometry" styleCategories="AllStyleCategories" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" geometry="No geometry" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" maxScale="0" minScale="1e+08" readOnly="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" type="vector" wkbType="NoGeometry">
       <id>glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab</id>
       <datasource>service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table="pgmetadata"."glossary"</datasource>
       <keywordList>
@@ -1703,7 +1901,7 @@ def my_form_open(dialog, layer, feature):
           <email></email>
           <role></role>
         </contact>
-        <links/>
+        <links></links>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -1720,7 +1918,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxx="0" dimensions="2" crs="" miny="0" maxz="0" minz="0" minx="0" maxy="0"/>
+          <spatial crs="" dimensions="2" maxx="0" maxy="0" maxz="0" minx="0" miny="0" minz="0"></spatial>
           <temporal>
             <period>
               <start></start>
@@ -1730,229 +1928,233 @@ def my_form_open(dialog, layer, feature):
         </extent>
       </resourceMetadata>
       <provider encoding="">postgres</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
+      <vectorjoins></vectorjoins>
+      <layerDependencies></layerDependencies>
+      <dataDependencies></dataDependencies>
+      <expressionfields></expressionfields>
       <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
+        <map-layer-style name="default"></map-layer-style>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
+      <auxiliaryLayer></auxiliaryLayer>
+      <metadataUrls></metadataUrls>
       <flags>
         <Identifiable>1</Identifiable>
         <Removable>1</Removable>
         <Searchable>1</Searchable>
+        <Private>0</Private>
       </flags>
-      <temporal endExpression="" startField="" startExpression="" enabled="0" fixedDuration="0" accumulate="0" durationUnit="min" mode="0" endField="" durationField="">
+      <temporal accumulate="0" durationField="" durationUnit="min" enabled="0" endExpression="" endField="" fixedDuration="0" limitMode="0" mode="0" startExpression="" startField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
       <customproperties>
-        <property key="dualview/previewExpressions">
-          <value>"label_en"</value>
-          <value>"description_en"</value>
-        </property>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
+        <Option type="Map">
+          <Option name="dualview/previewExpressions" type="StringList">
+            <Option type="QString" value="&quot;label_en&quot;"></Option>
+            <Option type="QString" value="&quot;description_en&quot;"></Option>
+          </Option>
+          <Option name="embeddedWidgets/count" type="QString" value="0"></Option>
+          <Option name="variableNames"></Option>
+          <Option name="variableValues"></Option>
+        </Option>
       </customproperties>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+        <activeChecks></activeChecks>
+        <checkConfiguration></checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector"/>
-      <referencedLayers/>
+      <legend showLabelLegend="0" type="default-vector"></legend>
+      <referencedLayers></referencedLayers>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="field" configurationFlags="None">
+        <field configurationFlags="None" name="field">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="code" configurationFlags="None">
+        <field configurationFlags="None" name="code">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_en" configurationFlags="None">
+        <field configurationFlags="None" name="label_en">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="description_en" configurationFlags="None">
+        <field configurationFlags="None" name="description_en">
           <editWidget type="TextEdit">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="item_order" configurationFlags="None">
+        <field configurationFlags="None" name="item_order">
           <editWidget type="Range">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_fr" configurationFlags="None">
+        <field configurationFlags="None" name="label_fr">
           <editWidget type="">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="description_fr" configurationFlags="None">
+        <field configurationFlags="None" name="description_fr">
           <editWidget type="">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_it" configurationFlags="None">
+        <field configurationFlags="None" name="label_it">
           <editWidget type="">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="description_it" configurationFlags="None">
+        <field configurationFlags="None" name="description_it">
           <editWidget type="">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_es" configurationFlags="None">
+        <field configurationFlags="None" name="label_es">
           <editWidget type="">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="description_es" configurationFlags="None">
+        <field configurationFlags="None" name="description_es">
           <editWidget type="">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_de" configurationFlags="None">
+        <field configurationFlags="None" name="label_de">
           <editWidget type="">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="description_de" configurationFlags="None">
+        <field configurationFlags="None" name="description_de">
           <editWidget type="">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="field" name="" index="1"/>
-        <alias field="code" name="" index="2"/>
-        <alias field="label_en" name="" index="3"/>
-        <alias field="description_en" name="" index="4"/>
-        <alias field="item_order" name="" index="5"/>
-        <alias field="label_fr" name="" index="6"/>
-        <alias field="description_fr" name="" index="7"/>
-        <alias field="label_it" name="" index="8"/>
-        <alias field="description_it" name="" index="9"/>
-        <alias field="label_es" name="" index="10"/>
-        <alias field="description_es" name="" index="11"/>
-        <alias field="label_de" name="" index="12"/>
-        <alias field="description_de" name="" index="13"/>
+        <alias field="id" index="0" name=""></alias>
+        <alias field="field" index="1" name=""></alias>
+        <alias field="code" index="2" name=""></alias>
+        <alias field="label_en" index="3" name=""></alias>
+        <alias field="description_en" index="4" name=""></alias>
+        <alias field="item_order" index="5" name=""></alias>
+        <alias field="label_fr" index="6" name=""></alias>
+        <alias field="description_fr" index="7" name=""></alias>
+        <alias field="label_it" index="8" name=""></alias>
+        <alias field="description_it" index="9" name=""></alias>
+        <alias field="label_es" index="10" name=""></alias>
+        <alias field="description_es" index="11" name=""></alias>
+        <alias field="label_de" index="12" name=""></alias>
+        <alias field="description_de" index="13" name=""></alias>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="field" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="label_en" applyOnUpdate="0"/>
-        <default expression="" field="description_en" applyOnUpdate="0"/>
-        <default expression="" field="item_order" applyOnUpdate="0"/>
-        <default expression="" field="label_fr" applyOnUpdate="0"/>
-        <default expression="" field="description_fr" applyOnUpdate="0"/>
-        <default expression="" field="label_it" applyOnUpdate="0"/>
-        <default expression="" field="description_it" applyOnUpdate="0"/>
-        <default expression="" field="label_es" applyOnUpdate="0"/>
-        <default expression="" field="description_es" applyOnUpdate="0"/>
-        <default expression="" field="label_de" applyOnUpdate="0"/>
-        <default expression="" field="description_de" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"></default>
+        <default applyOnUpdate="0" expression="" field="field"></default>
+        <default applyOnUpdate="0" expression="" field="code"></default>
+        <default applyOnUpdate="0" expression="" field="label_en"></default>
+        <default applyOnUpdate="0" expression="" field="description_en"></default>
+        <default applyOnUpdate="0" expression="" field="item_order"></default>
+        <default applyOnUpdate="0" expression="" field="label_fr"></default>
+        <default applyOnUpdate="0" expression="" field="description_fr"></default>
+        <default applyOnUpdate="0" expression="" field="label_it"></default>
+        <default applyOnUpdate="0" expression="" field="description_it"></default>
+        <default applyOnUpdate="0" expression="" field="label_es"></default>
+        <default applyOnUpdate="0" expression="" field="description_es"></default>
+        <default applyOnUpdate="0" expression="" field="label_de"></default>
+        <default applyOnUpdate="0" expression="" field="description_de"></default>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" constraints="3" field="id" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="1" field="field" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="1" field="code" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="1" field="label_en" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="0" field="description_en" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="item_order" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="label_fr" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="description_fr" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="label_it" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="description_it" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="label_es" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="description_es" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="label_de" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="description_de" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="3" exp_strength="0" field="id" notnull_strength="1" unique_strength="1"></constraint>
+        <constraint constraints="1" exp_strength="0" field="field" notnull_strength="1" unique_strength="0"></constraint>
+        <constraint constraints="1" exp_strength="0" field="code" notnull_strength="1" unique_strength="0"></constraint>
+        <constraint constraints="1" exp_strength="0" field="label_en" notnull_strength="1" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="description_en" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="item_order" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="label_fr" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="description_fr" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="label_it" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="description_it" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="label_es" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="description_es" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="label_de" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="description_de" notnull_strength="0" unique_strength="0"></constraint>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="field" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="label_en" desc="" exp=""/>
-        <constraint field="description_en" desc="" exp=""/>
-        <constraint field="item_order" desc="" exp=""/>
-        <constraint field="label_fr" desc="" exp=""/>
-        <constraint field="description_fr" desc="" exp=""/>
-        <constraint field="label_it" desc="" exp=""/>
-        <constraint field="description_it" desc="" exp=""/>
-        <constraint field="label_es" desc="" exp=""/>
-        <constraint field="description_es" desc="" exp=""/>
-        <constraint field="label_de" desc="" exp=""/>
-        <constraint field="description_de" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"></constraint>
+        <constraint desc="" exp="" field="field"></constraint>
+        <constraint desc="" exp="" field="code"></constraint>
+        <constraint desc="" exp="" field="label_en"></constraint>
+        <constraint desc="" exp="" field="description_en"></constraint>
+        <constraint desc="" exp="" field="item_order"></constraint>
+        <constraint desc="" exp="" field="label_fr"></constraint>
+        <constraint desc="" exp="" field="description_fr"></constraint>
+        <constraint desc="" exp="" field="label_it"></constraint>
+        <constraint desc="" exp="" field="description_it"></constraint>
+        <constraint desc="" exp="" field="label_es"></constraint>
+        <constraint desc="" exp="" field="description_es"></constraint>
+        <constraint desc="" exp="" field="label_de"></constraint>
+        <constraint desc="" exp="" field="description_de"></constraint>
       </constraintExpressions>
-      <expressionfields/>
+      <expressionfields></expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"></defaultAction>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="field" width="-1" hidden="0"/>
-          <column type="field" name="code" width="-1" hidden="0"/>
-          <column type="field" name="label" width="-1" hidden="0"/>
-          <column type="field" name="description" width="-1" hidden="0"/>
-          <column type="field" name="item_order" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" name="id" type="field" width="-1"></column>
+          <column hidden="0" name="field" type="field" width="-1"></column>
+          <column hidden="0" name="code" type="field" width="-1"></column>
+          <column hidden="0" name="label" type="field" width="-1"></column>
+          <column hidden="0" name="description" type="field" width="-1"></column>
+          <column hidden="0" name="item_order" type="field" width="-1"></column>
+          <column hidden="1" type="actions" width="-1"></column>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
+        <rowstyles></rowstyles>
+        <fieldstyles></fieldstyles>
       </conditionalstyles>
-      <storedexpressions/>
+      <storedexpressions></storedexpressions>
       <editform tolerant="1"></editform>
-      <editforminit/>
+      <editforminit></editforminit>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+      <editforminitcode># -*- coding: utf-8 -*-
 """
 QGIS forms can have a Python function that is called when the form is
 opened.
@@ -1968,31 +2170,32 @@ from qgis.PyQt.QtWidgets import QWidget
 def my_form_open(dialog, layer, feature):
 	geom = feature.geometry()
 	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
+</editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="code"/>
-        <field editable="1" name="description"/>
-        <field editable="1" name="field"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="item_order"/>
-        <field editable="1" name="label"/>
+        <field editable="1" name="code"></field>
+        <field editable="1" name="description"></field>
+        <field editable="1" name="field"></field>
+        <field editable="1" name="id"></field>
+        <field editable="1" name="item_order"></field>
+        <field editable="1" name="label"></field>
       </editable>
       <labelOnTop>
-        <field name="code" labelOnTop="0"/>
-        <field name="description" labelOnTop="0"/>
-        <field name="field" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="item_order" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
+        <field labelOnTop="0" name="code"></field>
+        <field labelOnTop="0" name="description"></field>
+        <field labelOnTop="0" name="field"></field>
+        <field labelOnTop="0" name="id"></field>
+        <field labelOnTop="0" name="item_order"></field>
+        <field labelOnTop="0" name="label"></field>
       </labelOnTop>
-      <dataDefinedFieldProperties/>
-      <widgets/>
+      <reuseLastValue></reuseLastValue>
+      <dataDefinedFieldProperties></dataDefinedFieldProperties>
+      <widgets></widgets>
       <previewExpression>"label"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" readOnly="0" type="vector" refreshOnNotifyEnabled="0" geometry="No geometry" maxScale="0" autoRefreshTime="0" wkbType="NoGeometry" styleCategories="AllStyleCategories" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" geometry="No geometry" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" maxScale="0" minScale="1e+08" readOnly="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" type="vector" wkbType="NoGeometry">
       <id>html_template_e9cca240_a640_4a7c_a9d0_a181beb9797e</id>
       <datasource>service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table="pgmetadata"."html_template"</datasource>
       <keywordList>
@@ -2028,7 +2231,7 @@ def my_form_open(dialog, layer, feature):
           <email></email>
           <role></role>
         </contact>
-        <links/>
+        <links></links>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -2045,7 +2248,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxx="0" dimensions="2" crs="" miny="0" maxz="0" minz="0" minx="0" maxy="0"/>
+          <spatial crs="" dimensions="2" maxx="0" maxy="0" maxz="0" minx="0" miny="0" minz="0"></spatial>
           <temporal>
             <period>
               <start></start>
@@ -2055,120 +2258,124 @@ def my_form_open(dialog, layer, feature):
         </extent>
       </resourceMetadata>
       <provider encoding="">postgres</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
+      <vectorjoins></vectorjoins>
+      <layerDependencies></layerDependencies>
+      <dataDependencies></dataDependencies>
+      <expressionfields></expressionfields>
       <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
+        <map-layer-style name="default"></map-layer-style>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
+      <auxiliaryLayer></auxiliaryLayer>
+      <metadataUrls></metadataUrls>
       <flags>
         <Identifiable>1</Identifiable>
         <Removable>1</Removable>
         <Searchable>1</Searchable>
+        <Private>0</Private>
       </flags>
-      <temporal endExpression="" startField="" startExpression="" enabled="0" fixedDuration="0" accumulate="0" durationUnit="min" mode="0" endField="" durationField="">
+      <temporal accumulate="0" durationField="" durationUnit="min" enabled="0" endExpression="" endField="" fixedDuration="0" limitMode="0" mode="0" startExpression="" startField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
       <customproperties>
-        <property value="&quot;section&quot;" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
+        <Option type="Map">
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;section&quot;"></Option>
+          <Option name="embeddedWidgets/count" type="QString" value="0"></Option>
+          <Option name="variableNames"></Option>
+          <Option name="variableValues"></Option>
+        </Option>
       </customproperties>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+        <activeChecks></activeChecks>
+        <checkConfiguration></checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector"/>
-      <referencedLayers/>
+      <legend showLabelLegend="0" type="default-vector"></legend>
+      <referencedLayers></referencedLayers>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="section" configurationFlags="None">
+        <field configurationFlags="None" name="section">
           <editWidget type="ValueMap">
             <config>
               <Option type="Map">
-                <Option type="List" name="map">
+                <Option name="map" type="List">
                   <Option type="Map">
-                    <Option type="QString" value="main" name="Main"/>
+                    <Option name="Main" type="QString" value="main"></Option>
                   </Option>
                   <Option type="Map">
-                    <Option type="QString" value="links" name="Links"/>
+                    <Option name="Links" type="QString" value="links"></Option>
                   </Option>
                   <Option type="Map">
-                    <Option type="QString" value="contacts" name="Contacts"/>
+                    <Option name="Contacts" type="QString" value="contacts"></Option>
                   </Option>
                 </Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="content" configurationFlags="None">
+        <field configurationFlags="None" name="content">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="true" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="true"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="Id" index="0"/>
-        <alias field="section" name="Section" index="1"/>
-        <alias field="content" name="HTML template. Fields must be written as [% &quot;title&quot; %]" index="2"/>
+        <alias field="id" index="0" name="Id"></alias>
+        <alias field="section" index="1" name="Section"></alias>
+        <alias field="content" index="2" name="HTML template. Fields must be written as [% &quot;title&quot; %]"></alias>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="section" applyOnUpdate="0"/>
-        <default expression="" field="content" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"></default>
+        <default applyOnUpdate="0" expression="" field="section"></default>
+        <default applyOnUpdate="0" expression="" field="content"></default>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" constraints="3" field="id" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="1" constraints="7" field="section" exp_strength="2" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="0" field="content" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="3" exp_strength="0" field="id" notnull_strength="1" unique_strength="1"></constraint>
+        <constraint constraints="7" exp_strength="2" field="section" notnull_strength="1" unique_strength="1"></constraint>
+        <constraint constraints="0" exp_strength="0" field="content" notnull_strength="0" unique_strength="0"></constraint>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="section" desc="Section must be either 'main', 'links' or 'contacts'" exp="&quot;section&quot; IN ('main', 'links', 'contacts')"/>
-        <constraint field="content" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"></constraint>
+        <constraint desc="Section must be either 'main', 'links' or 'contacts'" exp="&quot;section&quot; IN ('main', 'links', 'contacts')" field="section"></constraint>
+        <constraint desc="" exp="" field="content"></constraint>
       </constraintExpressions>
-      <expressionfields/>
+      <expressionfields></expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"></defaultAction>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="section" width="-1" hidden="0"/>
-          <column type="field" name="content" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" name="id" type="field" width="-1"></column>
+          <column hidden="0" name="section" type="field" width="-1"></column>
+          <column hidden="0" name="content" type="field" width="-1"></column>
+          <column hidden="1" type="actions" width="-1"></column>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
+        <rowstyles></rowstyles>
+        <fieldstyles></fieldstyles>
       </conditionalstyles>
-      <storedexpressions/>
+      <storedexpressions></storedexpressions>
       <editform tolerant="1"></editform>
-      <editforminit/>
+      <editforminit></editforminit>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+      <editforminitcode># -*- coding: utf-8 -*-
 """
 QGIS forms can have a Python function that is called when the form is
 opened.
@@ -2184,29 +2391,30 @@ from qgis.PyQt.QtWidgets import QWidget
 def my_form_open(dialog, layer, feature):
 	geom = feature.geometry()
 	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
+</editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>tablayout</editorlayout>
       <attributeEditorForm>
-        <attributeEditorField name="section" index="1" showLabel="1"/>
-        <attributeEditorField name="content" index="2" showLabel="1"/>
+        <attributeEditorField index="1" name="section" showLabel="1"></attributeEditorField>
+        <attributeEditorField index="2" name="content" showLabel="1"></attributeEditorField>
       </attributeEditorForm>
       <editable>
-        <field editable="1" name="content"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="section"/>
+        <field editable="1" name="content"></field>
+        <field editable="1" name="id"></field>
+        <field editable="1" name="section"></field>
       </editable>
       <labelOnTop>
-        <field name="content" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="section" labelOnTop="0"/>
+        <field labelOnTop="0" name="content"></field>
+        <field labelOnTop="0" name="id"></field>
+        <field labelOnTop="0" name="section"></field>
       </labelOnTop>
-      <dataDefinedFieldProperties/>
-      <widgets/>
+      <reuseLastValue></reuseLastValue>
+      <dataDefinedFieldProperties></dataDefinedFieldProperties>
+      <widgets></widgets>
       <previewExpression>"section"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" readOnly="0" type="vector" refreshOnNotifyEnabled="0" geometry="No geometry" maxScale="0" autoRefreshTime="0" wkbType="NoGeometry" styleCategories="AllStyleCategories" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" geometry="No geometry" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" maxScale="0" minScale="1e+08" readOnly="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" type="vector" wkbType="NoGeometry">
       <id>link_6157b282_9882_44f3_b6a1_c133f5595d2a</id>
       <datasource>service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table="pgmetadata"."link"</datasource>
       <keywordList>
@@ -2243,7 +2451,7 @@ def my_form_open(dialog, layer, feature):
           <role></role>
         </contact>
         <links>
-          <link description="" type="" name="undefined 1" url="" format="" size="" mimeType=""/>
+          <link description="" format="" mimeType="" name="undefined 1" size="" type="" url=""></link>
         </links>
         <fees></fees>
         <encoding></encoding>
@@ -2261,7 +2469,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxx="0" dimensions="2" crs="" miny="0" maxz="0" minz="0" minx="0" maxy="0"/>
+          <spatial crs="" dimensions="2" maxx="0" maxy="0" maxz="0" minx="0" miny="0" minz="0"></spatial>
           <temporal>
             <period>
               <start></start>
@@ -2271,235 +2479,239 @@ def my_form_open(dialog, layer, feature):
         </extent>
       </resourceMetadata>
       <provider encoding="">postgres</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
+      <vectorjoins></vectorjoins>
+      <layerDependencies></layerDependencies>
+      <dataDependencies></dataDependencies>
+      <expressionfields></expressionfields>
       <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
+        <map-layer-style name="default"></map-layer-style>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
+      <auxiliaryLayer></auxiliaryLayer>
+      <metadataUrls></metadataUrls>
       <flags>
         <Identifiable>1</Identifiable>
         <Removable>1</Removable>
         <Searchable>1</Searchable>
+        <Private>0</Private>
       </flags>
-      <temporal endExpression="" startField="" startExpression="" enabled="0" fixedDuration="0" accumulate="0" durationUnit="min" mode="0" endField="" durationField="">
+      <temporal accumulate="0" durationField="" durationUnit="min" enabled="0" endExpression="" endField="" fixedDuration="0" limitMode="0" mode="0" startExpression="" startField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
       <customproperties>
-        <property value="&quot;name&quot;" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
+        <Option type="Map">
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;name&quot;"></Option>
+          <Option name="embeddedWidgets/count" type="QString" value="0"></Option>
+          <Option name="variableNames"></Option>
+          <Option name="variableValues"></Option>
+        </Option>
       </customproperties>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+        <activeChecks></activeChecks>
+        <checkConfiguration></checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector"/>
+      <legend showLabelLegend="0" type="default-vector"></legend>
       <referencedLayers>
-        <relation layerName="Dataset" name="link_fk_id_dataset_fkey" strength="Association" dataSource="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true srid=4326 type=Polygon checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;dataset&quot; (geom)" referencingLayer="link_6157b282_9882_44f3_b6a1_c133f5595d2a" referencedLayer="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd" providerKey="postgres" id="link_6157b282_9882_44f3_b6a1_c133f5595d2a_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id" layerId="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd">
-          <fieldRef referencedField="id" referencingField="fk_id_dataset"/>
+        <relation dataSource="service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true srid=4326 type=Polygon checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;dataset&quot; (geom)" id="link_6157b282_9882_44f3_b6a1_c133f5595d2a_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id" layerId="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd" layerName="Dataset" name="link_fk_id_dataset_fkey" providerKey="postgres" referencedLayer="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd" referencingLayer="link_6157b282_9882_44f3_b6a1_c133f5595d2a" strength="Association">
+          <fieldRef referencedField="id" referencingField="fk_id_dataset"></fieldRef>
         </relation>
       </referencedLayers>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="ValueRelation">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="AllowMulti"/>
-                <Option type="bool" value="false" name="AllowNull"/>
-                <Option type="QString" value="&quot;field&quot; = 'link.type'" name="FilterExpression"/>
-                <Option type="QString" value="code" name="Key"/>
-                <Option type="QString" value="glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab" name="Layer"/>
-                <Option type="QString" value="Glossary" name="LayerName"/>
-                <Option type="QString" value="postgres" name="LayerProviderName"/>
-                <Option type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable key='id' estimatedmetadata=false checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;glossary&quot; sql=" name="LayerSource"/>
-                <Option type="int" value="1" name="NofColumns"/>
-                <Option type="bool" value="true" name="OrderByValue"/>
-                <Option type="bool" value="false" name="UseCompleter"/>
-                <Option type="QString" value="label_en" name="Value"/>
+                <Option name="AllowMulti" type="bool" value="false"></Option>
+                <Option name="AllowNull" type="bool" value="false"></Option>
+                <Option name="FilterExpression" type="QString" value="&quot;field&quot; = 'link.type'"></Option>
+                <Option name="Key" type="QString" value="code"></Option>
+                <Option name="Layer" type="QString" value="glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab"></Option>
+                <Option name="LayerName" type="QString" value="Glossary"></Option>
+                <Option name="LayerProviderName" type="QString" value="postgres"></Option>
+                <Option name="LayerSource" type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable estimatedmetadata=true sslmode=disable key='id' estimatedmetadata=false checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;glossary&quot; sql="></Option>
+                <Option name="NofColumns" type="int" value="1"></Option>
+                <Option name="OrderByValue" type="bool" value="true"></Option>
+                <Option name="UseCompleter" type="bool" value="false"></Option>
+                <Option name="Value" type="QString" value="label_en"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="url" configurationFlags="None">
+        <field configurationFlags="None" name="url">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="description" configurationFlags="None">
+        <field configurationFlags="None" name="description">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="true" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="true"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="format" configurationFlags="None">
+        <field configurationFlags="None" name="format">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="mime" configurationFlags="None">
+        <field configurationFlags="None" name="mime">
           <editWidget type="ValueRelation">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="AllowMulti"/>
-                <Option type="bool" value="false" name="AllowNull"/>
-                <Option type="QString" value="&quot;field&quot; = 'link.mime'" name="FilterExpression"/>
-                <Option type="QString" value="code" name="Key"/>
-                <Option type="QString" value="glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab" name="Layer"/>
-                <Option type="QString" value="Glossary" name="LayerName"/>
-                <Option type="QString" value="postgres" name="LayerProviderName"/>
-                <Option type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable key='id' estimatedmetadata=false checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;glossary&quot; sql=" name="LayerSource"/>
-                <Option type="int" value="1" name="NofColumns"/>
-                <Option type="bool" value="false" name="OrderByValue"/>
-                <Option type="bool" value="false" name="UseCompleter"/>
-                <Option type="QString" value="label_en" name="Value"/>
+                <Option name="AllowMulti" type="bool" value="false"></Option>
+                <Option name="AllowNull" type="bool" value="false"></Option>
+                <Option name="FilterExpression" type="QString" value="&quot;field&quot; = 'link.mime'"></Option>
+                <Option name="Key" type="QString" value="code"></Option>
+                <Option name="Layer" type="QString" value="glossary_7235d2fd_01a3_45dc_8321_ea0dc29e55ab"></Option>
+                <Option name="LayerName" type="QString" value="Glossary"></Option>
+                <Option name="LayerProviderName" type="QString" value="postgres"></Option>
+                <Option name="LayerSource" type="QString" value="service='pgmetadata' sslmode=disable estimatedmetadata=true sslmode=disable estimatedmetadata=true sslmode=disable key='id' estimatedmetadata=false checkPrimaryKeyUnicity='1' table=&quot;pgmetadata&quot;.&quot;glossary&quot; sql="></Option>
+                <Option name="NofColumns" type="int" value="1"></Option>
+                <Option name="OrderByValue" type="bool" value="false"></Option>
+                <Option name="UseCompleter" type="bool" value="false"></Option>
+                <Option name="Value" type="QString" value="label_en"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="size" configurationFlags="None">
+        <field configurationFlags="None" name="size">
           <editWidget type="Range">
             <config>
               <Option type="Map">
-                <Option type="bool" value="true" name="AllowNull"/>
-                <Option type="int" value="2147483647" name="Max"/>
-                <Option type="int" value="-2147483648" name="Min"/>
-                <Option type="int" value="0" name="Precision"/>
-                <Option type="int" value="1" name="Step"/>
-                <Option type="QString" value="SpinBox" name="Style"/>
+                <Option name="AllowNull" type="bool" value="true"></Option>
+                <Option name="Max" type="int" value="2147483647"></Option>
+                <Option name="Min" type="int" value="-2147483648"></Option>
+                <Option name="Precision" type="int" value="0"></Option>
+                <Option name="Step" type="int" value="1"></Option>
+                <Option name="Style" type="QString" value="SpinBox"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="fk_id_dataset" configurationFlags="None">
+        <field configurationFlags="None" name="fk_id_dataset">
           <editWidget type="RelationReference">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="AllowAddFeatures"/>
-                <Option type="bool" value="false" name="AllowNULL"/>
-                <Option type="bool" value="false" name="MapIdentification"/>
-                <Option type="bool" value="false" name="OrderByValue"/>
-                <Option type="bool" value="false" name="ReadOnly"/>
-                <Option type="QString" value="link_6157b282_9882_44f3_b6a1_c133f5595d2a_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id" name="Relation"/>
-                <Option type="bool" value="false" name="ShowForm"/>
-                <Option type="bool" value="true" name="ShowOpenFormButton"/>
+                <Option name="AllowAddFeatures" type="bool" value="false"></Option>
+                <Option name="AllowNULL" type="bool" value="false"></Option>
+                <Option name="MapIdentification" type="bool" value="false"></Option>
+                <Option name="OrderByValue" type="bool" value="false"></Option>
+                <Option name="ReadOnly" type="bool" value="false"></Option>
+                <Option name="Relation" type="QString" value="link_6157b282_9882_44f3_b6a1_c133f5595d2a_fk_id_dataset_dataset_00c9da4d_d717_48cc_a848_0d4544b019fd_id"></Option>
+                <Option name="ShowForm" type="bool" value="false"></Option>
+                <Option name="ShowOpenFormButton" type="bool" value="true"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="Id" index="0"/>
-        <alias field="name" name="Name of the ressource" index="1"/>
-        <alias field="type" name="Type" index="2"/>
-        <alias field="url" name="URL" index="3"/>
-        <alias field="description" name="Description" index="4"/>
-        <alias field="format" name="Format" index="5"/>
-        <alias field="mime" name="Mime type" index="6"/>
-        <alias field="size" name="Size" index="7"/>
-        <alias field="fk_id_dataset" name="" index="8"/>
+        <alias field="id" index="0" name="Id"></alias>
+        <alias field="name" index="1" name="Name of the ressource"></alias>
+        <alias field="type" index="2" name="Type"></alias>
+        <alias field="url" index="3" name="URL"></alias>
+        <alias field="description" index="4" name="Description"></alias>
+        <alias field="format" index="5" name="Format"></alias>
+        <alias field="mime" index="6" name="Mime type"></alias>
+        <alias field="size" index="7" name="Size"></alias>
+        <alias field="fk_id_dataset" index="8" name=""></alias>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="url" applyOnUpdate="0"/>
-        <default expression="" field="description" applyOnUpdate="0"/>
-        <default expression="" field="format" applyOnUpdate="0"/>
-        <default expression="" field="mime" applyOnUpdate="0"/>
-        <default expression="" field="size" applyOnUpdate="0"/>
-        <default expression="" field="fk_id_dataset" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"></default>
+        <default applyOnUpdate="0" expression="" field="name"></default>
+        <default applyOnUpdate="0" expression="" field="type"></default>
+        <default applyOnUpdate="0" expression="" field="url"></default>
+        <default applyOnUpdate="0" expression="" field="description"></default>
+        <default applyOnUpdate="0" expression="" field="format"></default>
+        <default applyOnUpdate="0" expression="" field="mime"></default>
+        <default applyOnUpdate="0" expression="" field="size"></default>
+        <default applyOnUpdate="0" expression="" field="fk_id_dataset"></default>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" constraints="3" field="id" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="1" field="name" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="1" field="type" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="5" field="url" exp_strength="2" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="0" field="description" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="format" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="mime" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="size" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="1" field="fk_id_dataset" exp_strength="0" notnull_strength="1"/>
+        <constraint constraints="3" exp_strength="0" field="id" notnull_strength="1" unique_strength="1"></constraint>
+        <constraint constraints="1" exp_strength="0" field="name" notnull_strength="1" unique_strength="0"></constraint>
+        <constraint constraints="1" exp_strength="0" field="type" notnull_strength="1" unique_strength="0"></constraint>
+        <constraint constraints="5" exp_strength="2" field="url" notnull_strength="1" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="description" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="format" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="mime" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="size" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="1" exp_strength="0" field="fk_id_dataset" notnull_strength="1" unique_strength="0"></constraint>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="url" desc="URL must start with ftp://, http:// or https://" exp="regexp_match( &quot;url&quot;, '^(ht|f)tp(s)?:/')"/>
-        <constraint field="description" desc="" exp=""/>
-        <constraint field="format" desc="" exp=""/>
-        <constraint field="mime" desc="" exp=""/>
-        <constraint field="size" desc="" exp=""/>
-        <constraint field="fk_id_dataset" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"></constraint>
+        <constraint desc="" exp="" field="name"></constraint>
+        <constraint desc="" exp="" field="type"></constraint>
+        <constraint desc="URL must start with ftp://, http:// or https://" exp="regexp_match( &quot;url&quot;, '^(ht|f)tp(s)?:/')" field="url"></constraint>
+        <constraint desc="" exp="" field="description"></constraint>
+        <constraint desc="" exp="" field="format"></constraint>
+        <constraint desc="" exp="" field="mime"></constraint>
+        <constraint desc="" exp="" field="size"></constraint>
+        <constraint desc="" exp="" field="fk_id_dataset"></constraint>
       </constraintExpressions>
-      <expressionfields/>
+      <expressionfields></expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"></defaultAction>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="name" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="url" width="-1" hidden="0"/>
-          <column type="field" name="description" width="-1" hidden="0"/>
-          <column type="field" name="format" width="-1" hidden="0"/>
-          <column type="field" name="mime" width="-1" hidden="0"/>
-          <column type="field" name="size" width="-1" hidden="0"/>
-          <column type="field" name="fk_id_dataset" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" name="id" type="field" width="-1"></column>
+          <column hidden="0" name="name" type="field" width="-1"></column>
+          <column hidden="0" name="type" type="field" width="-1"></column>
+          <column hidden="0" name="url" type="field" width="-1"></column>
+          <column hidden="0" name="description" type="field" width="-1"></column>
+          <column hidden="0" name="format" type="field" width="-1"></column>
+          <column hidden="0" name="mime" type="field" width="-1"></column>
+          <column hidden="0" name="size" type="field" width="-1"></column>
+          <column hidden="0" name="fk_id_dataset" type="field" width="-1"></column>
+          <column hidden="1" type="actions" width="-1"></column>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
+        <rowstyles></rowstyles>
+        <fieldstyles></fieldstyles>
       </conditionalstyles>
-      <storedexpressions/>
+      <storedexpressions></storedexpressions>
       <editform tolerant="1"></editform>
-      <editforminit/>
+      <editforminit></editforminit>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+      <editforminitcode># -*- coding: utf-8 -*-
 """
 QGIS forms can have a Python function that is called when the form is
 opened.
@@ -2515,47 +2727,48 @@ from qgis.PyQt.QtWidgets import QWidget
 def my_form_open(dialog, layer, feature):
 	geom = feature.geometry()
 	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
+</editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>tablayout</editorlayout>
       <attributeEditorForm>
-        <attributeEditorField name="name" index="1" showLabel="1"/>
-        <attributeEditorField name="type" index="2" showLabel="1"/>
-        <attributeEditorField name="url" index="3" showLabel="1"/>
-        <attributeEditorField name="description" index="4" showLabel="1"/>
-        <attributeEditorField name="format" index="5" showLabel="1"/>
-        <attributeEditorField name="mime" index="6" showLabel="1"/>
-        <attributeEditorField name="size" index="7" showLabel="1"/>
-        <attributeEditorField name="fk_id_dataset" index="8" showLabel="1"/>
+        <attributeEditorField index="1" name="name" showLabel="1"></attributeEditorField>
+        <attributeEditorField index="2" name="type" showLabel="1"></attributeEditorField>
+        <attributeEditorField index="3" name="url" showLabel="1"></attributeEditorField>
+        <attributeEditorField index="4" name="description" showLabel="1"></attributeEditorField>
+        <attributeEditorField index="5" name="format" showLabel="1"></attributeEditorField>
+        <attributeEditorField index="6" name="mime" showLabel="1"></attributeEditorField>
+        <attributeEditorField index="7" name="size" showLabel="1"></attributeEditorField>
+        <attributeEditorField index="8" name="fk_id_dataset" showLabel="1"></attributeEditorField>
       </attributeEditorForm>
       <editable>
-        <field editable="1" name="description"/>
-        <field editable="1" name="fk_id_dataset"/>
-        <field editable="1" name="format"/>
-        <field editable="0" name="id"/>
-        <field editable="1" name="mime"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="size"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="url"/>
+        <field editable="1" name="description"></field>
+        <field editable="1" name="fk_id_dataset"></field>
+        <field editable="1" name="format"></field>
+        <field editable="0" name="id"></field>
+        <field editable="1" name="mime"></field>
+        <field editable="1" name="name"></field>
+        <field editable="1" name="size"></field>
+        <field editable="1" name="type"></field>
+        <field editable="1" name="url"></field>
       </editable>
       <labelOnTop>
-        <field name="description" labelOnTop="0"/>
-        <field name="fk_id_dataset" labelOnTop="0"/>
-        <field name="format" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="mime" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="size" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="url" labelOnTop="0"/>
+        <field labelOnTop="0" name="description"></field>
+        <field labelOnTop="0" name="fk_id_dataset"></field>
+        <field labelOnTop="0" name="format"></field>
+        <field labelOnTop="0" name="id"></field>
+        <field labelOnTop="0" name="mime"></field>
+        <field labelOnTop="0" name="name"></field>
+        <field labelOnTop="0" name="size"></field>
+        <field labelOnTop="0" name="type"></field>
+        <field labelOnTop="0" name="url"></field>
       </labelOnTop>
-      <dataDefinedFieldProperties/>
-      <widgets/>
+      <reuseLastValue></reuseLastValue>
+      <dataDefinedFieldProperties></dataDefinedFieldProperties>
+      <widgets></widgets>
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" readOnly="0" type="vector" refreshOnNotifyEnabled="0" geometry="No geometry" maxScale="0" autoRefreshTime="0" wkbType="NoGeometry" styleCategories="AllStyleCategories" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" geometry="No geometry" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" maxScale="0" minScale="1e+08" readOnly="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" type="vector" wkbType="NoGeometry">
       <id>theme_3d260140_3e41_4dbe_8e79_813f3f5d3d50</id>
       <datasource>service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table="pgmetadata"."theme"</datasource>
       <keywordList>
@@ -2591,7 +2804,7 @@ def my_form_open(dialog, layer, feature):
           <email></email>
           <role></role>
         </contact>
-        <links/>
+        <links></links>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -2608,7 +2821,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxx="0" dimensions="2" crs="" miny="0" maxz="0" minz="0" minx="0" maxy="0"/>
+          <spatial crs="" dimensions="2" maxx="0" maxy="0" maxz="0" minx="0" miny="0" minz="0"></spatial>
           <temporal>
             <period>
               <start></start>
@@ -2618,122 +2831,126 @@ def my_form_open(dialog, layer, feature):
         </extent>
       </resourceMetadata>
       <provider encoding="">postgres</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
+      <vectorjoins></vectorjoins>
+      <layerDependencies></layerDependencies>
+      <dataDependencies></dataDependencies>
+      <expressionfields></expressionfields>
       <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+        <map-layer-style name="défaut"></map-layer-style>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
+      <auxiliaryLayer></auxiliaryLayer>
+      <metadataUrls></metadataUrls>
       <flags>
         <Identifiable>1</Identifiable>
         <Removable>1</Removable>
         <Searchable>1</Searchable>
+        <Private>0</Private>
       </flags>
-      <temporal endExpression="" startField="" startExpression="" enabled="0" fixedDuration="0" accumulate="0" durationUnit="min" mode="0" endField="" durationField="">
+      <temporal accumulate="0" durationField="" durationUnit="min" enabled="0" endExpression="" endField="" fixedDuration="0" limitMode="0" mode="0" startExpression="" startField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
       <customproperties>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
+        <Option type="Map">
+          <Option name="embeddedWidgets/count" type="QString" value="0"></Option>
+          <Option name="variableNames"></Option>
+          <Option name="variableValues"></Option>
+        </Option>
       </customproperties>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+        <activeChecks></activeChecks>
+        <checkConfiguration></checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector"/>
-      <referencedLayers/>
+      <legend showLabelLegend="0" type="default-vector"></legend>
+      <referencedLayers></referencedLayers>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="Hidden">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="code" configurationFlags="None">
+        <field configurationFlags="None" name="code">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label" configurationFlags="None">
+        <field configurationFlags="None" name="label">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="description" configurationFlags="None">
+        <field configurationFlags="None" name="description">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="code" name="Code" index="1"/>
-        <alias field="label" name="Label" index="2"/>
-        <alias field="description" name="Description" index="3"/>
+        <alias field="id" index="0" name=""></alias>
+        <alias field="code" index="1" name="Code"></alias>
+        <alias field="label" index="2" name="Label"></alias>
+        <alias field="description" index="3" name="Description"></alias>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="code" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="description" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"></default>
+        <default applyOnUpdate="0" expression="" field="code"></default>
+        <default applyOnUpdate="0" expression="" field="label"></default>
+        <default applyOnUpdate="0" expression="" field="description"></default>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" constraints="3" field="id" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="1" constraints="3" field="code" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="1" constraints="3" field="label" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="0" field="description" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="3" exp_strength="0" field="id" notnull_strength="1" unique_strength="1"></constraint>
+        <constraint constraints="3" exp_strength="0" field="code" notnull_strength="1" unique_strength="1"></constraint>
+        <constraint constraints="3" exp_strength="0" field="label" notnull_strength="1" unique_strength="1"></constraint>
+        <constraint constraints="0" exp_strength="0" field="description" notnull_strength="0" unique_strength="0"></constraint>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="code" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="description" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"></constraint>
+        <constraint desc="" exp="" field="code"></constraint>
+        <constraint desc="" exp="" field="label"></constraint>
+        <constraint desc="" exp="" field="description"></constraint>
       </constraintExpressions>
-      <expressionfields/>
+      <expressionfields></expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"></defaultAction>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="code" width="-1" hidden="0"/>
-          <column type="field" name="label" width="-1" hidden="0"/>
-          <column type="field" name="description" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" name="id" type="field" width="-1"></column>
+          <column hidden="0" name="code" type="field" width="-1"></column>
+          <column hidden="0" name="label" type="field" width="-1"></column>
+          <column hidden="0" name="description" type="field" width="-1"></column>
+          <column hidden="1" type="actions" width="-1"></column>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
+        <rowstyles></rowstyles>
+        <fieldstyles></fieldstyles>
       </conditionalstyles>
-      <storedexpressions/>
+      <storedexpressions></storedexpressions>
       <editform tolerant="1"></editform>
-      <editforminit/>
+      <editforminit></editforminit>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+      <editforminitcode># -*- coding: utf-8 -*-
 """
 QGIS forms can have a Python function that is called when the form is
 opened.
@@ -2749,27 +2966,28 @@ from qgis.PyQt.QtWidgets import QWidget
 def my_form_open(dialog, layer, feature):
 	geom = feature.geometry()
 	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
+</editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="code"/>
-        <field editable="1" name="description"/>
-        <field editable="0" name="id"/>
-        <field editable="1" name="label"/>
+        <field editable="1" name="code"></field>
+        <field editable="1" name="description"></field>
+        <field editable="0" name="id"></field>
+        <field editable="1" name="label"></field>
       </editable>
       <labelOnTop>
-        <field name="code" labelOnTop="0"/>
-        <field name="description" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
+        <field labelOnTop="0" name="code"></field>
+        <field labelOnTop="0" name="description"></field>
+        <field labelOnTop="0" name="id"></field>
+        <field labelOnTop="0" name="label"></field>
       </labelOnTop>
-      <dataDefinedFieldProperties/>
-      <widgets/>
+      <reuseLastValue></reuseLastValue>
+      <dataDefinedFieldProperties></dataDefinedFieldProperties>
+      <widgets></widgets>
       <previewExpression>"description"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" readOnly="0" type="vector" refreshOnNotifyEnabled="0" geometry="No geometry" maxScale="0" autoRefreshTime="0" wkbType="NoGeometry" styleCategories="AllStyleCategories" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" geometry="No geometry" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" maxScale="0" minScale="1e+08" readOnly="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" type="vector" wkbType="NoGeometry">
       <id>v_locales_f4efa77e_8eb0_4d5a_809c_d479ae6cc850</id>
       <datasource>service='pgmetadata' sslmode=disable key='locale' estimatedmetadata=true checkPrimaryKeyUnicity='1' table="pgmetadata"."v_locales"</datasource>
       <keywordList>
@@ -2796,7 +3014,7 @@ def my_form_open(dialog, layer, feature):
         <type>dataset</type>
         <title></title>
         <abstract>Lists the locales available in the glossary, by listing the columns label_xx of the table pgmetadata.glossary</abstract>
-        <links/>
+        <links></links>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -2812,85 +3030,90 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent></extent>
       </resourceMetadata>
       <provider encoding="">postgres</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
+      <vectorjoins></vectorjoins>
+      <layerDependencies></layerDependencies>
+      <dataDependencies></dataDependencies>
+      <expressionfields></expressionfields>
       <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+        <map-layer-style name="défaut"></map-layer-style>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
+      <auxiliaryLayer></auxiliaryLayer>
+      <metadataUrls></metadataUrls>
       <flags>
         <Identifiable>1</Identifiable>
         <Removable>1</Removable>
         <Searchable>1</Searchable>
+        <Private>0</Private>
       </flags>
-      <temporal endExpression="" startField="" startExpression="" enabled="0" fixedDuration="0" accumulate="0" durationUnit="min" mode="0" endField="" durationField="">
+      <temporal accumulate="0" durationField="" durationUnit="min" enabled="0" endExpression="" endField="" fixedDuration="0" limitMode="0" mode="0" startExpression="" startField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <customproperties/>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <customproperties>
+        <Option></Option>
+      </customproperties>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
-          <Option type="QString" value=""/>
+          <Option type="QString" value=""></Option>
         </activeChecks>
-        <checkConfiguration/>
+        <checkConfiguration></checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector"/>
-      <referencedLayers/>
+      <legend showLabelLegend="0" type="default-vector"></legend>
+      <referencedLayers></referencedLayers>
       <fieldConfiguration>
-        <field name="locale" configurationFlags="None">
+        <field configurationFlags="None" name="locale">
           <editWidget type="">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="locale" name="" index="0"/>
+        <alias field="locale" index="0" name=""></alias>
       </aliases>
       <defaults>
-        <default expression="" field="locale" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="locale"></default>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" constraints="3" field="locale" exp_strength="0" notnull_strength="1"/>
+        <constraint constraints="3" exp_strength="0" field="locale" notnull_strength="1" unique_strength="1"></constraint>
       </constraints>
       <constraintExpressions>
-        <constraint field="locale" desc="" exp=""/>
+        <constraint desc="" exp="" field="locale"></constraint>
       </constraintExpressions>
-      <expressionfields/>
+      <expressionfields></expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"></defaultAction>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
-        <columns/>
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+        <columns></columns>
       </attributetableconfig>
       <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
+        <rowstyles></rowstyles>
+        <fieldstyles></fieldstyles>
       </conditionalstyles>
-      <storedexpressions/>
+      <storedexpressions></storedexpressions>
       <editform tolerant="1"></editform>
-      <editforminit/>
+      <editforminit></editforminit>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode></editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
-      <editable/>
-      <labelOnTop/>
-      <dataDefinedFieldProperties/>
-      <widgets/>
+      <editable></editable>
+      <labelOnTop></labelOnTop>
+      <reuseLastValue></reuseLastValue>
+      <dataDefinedFieldProperties></dataDefinedFieldProperties>
+      <widgets></widgets>
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" readOnly="1" type="vector" refreshOnNotifyEnabled="0" geometry="No geometry" maxScale="0" autoRefreshTime="0" wkbType="NoGeometry" styleCategories="AllStyleCategories" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" geometry="No geometry" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" maxScale="0" minScale="1e+08" readOnly="1" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" type="vector" wkbType="NoGeometry">
       <id>v_orphan_dataset_items_0fbfb83f_0c98_4391_bf51_8b5d8a362a73</id>
       <datasource>service='pgmetadata' sslmode=disable key='schema_name' estimatedmetadata=true checkPrimaryKeyUnicity='1' table="pgmetadata"."v_orphan_dataset_items"</datasource>
       <keywordList>
@@ -2926,7 +3149,7 @@ def my_form_open(dialog, layer, feature):
           <email></email>
           <role></role>
         </contact>
-        <links/>
+        <links></links>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -2943,7 +3166,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxx="0" dimensions="2" crs="" miny="0" maxz="0" minz="0" minx="0" maxy="0"/>
+          <spatial crs="" dimensions="2" maxx="0" maxy="0" maxz="0" minx="0" miny="0" minz="0"></spatial>
           <temporal>
             <period>
               <start></start>
@@ -2953,110 +3176,114 @@ def my_form_open(dialog, layer, feature):
         </extent>
       </resourceMetadata>
       <provider encoding="">postgres</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
+      <vectorjoins></vectorjoins>
+      <layerDependencies></layerDependencies>
+      <dataDependencies></dataDependencies>
+      <expressionfields></expressionfields>
       <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+        <map-layer-style name="défaut"></map-layer-style>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
+      <auxiliaryLayer></auxiliaryLayer>
+      <metadataUrls></metadataUrls>
       <flags>
         <Identifiable>1</Identifiable>
         <Removable>1</Removable>
         <Searchable>1</Searchable>
+        <Private>0</Private>
       </flags>
-      <temporal endExpression="" startField="" startExpression="" enabled="0" fixedDuration="0" accumulate="0" durationUnit="min" mode="0" endField="" durationField="">
+      <temporal accumulate="0" durationField="" durationUnit="min" enabled="0" endExpression="" endField="" fixedDuration="0" limitMode="0" mode="0" startExpression="" startField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
       <customproperties>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
+        <Option type="Map">
+          <Option name="embeddedWidgets/count" type="QString" value="0"></Option>
+          <Option name="variableNames"></Option>
+          <Option name="variableValues"></Option>
+        </Option>
       </customproperties>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+        <activeChecks></activeChecks>
+        <checkConfiguration></checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector"/>
-      <referencedLayers/>
+      <legend showLabelLegend="0" type="default-vector"></legend>
+      <referencedLayers></referencedLayers>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="schema_name" configurationFlags="None">
+        <field configurationFlags="None" name="schema_name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="table_name" configurationFlags="None">
+        <field configurationFlags="None" name="table_name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="schema_name" name="Schema" index="1"/>
-        <alias field="table_name" name="Table" index="2"/>
+        <alias field="id" index="0" name=""></alias>
+        <alias field="schema_name" index="1" name="Schema"></alias>
+        <alias field="table_name" index="2" name="Table"></alias>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="schema_name" applyOnUpdate="0"/>
-        <default expression="" field="table_name" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"></default>
+        <default applyOnUpdate="0" expression="" field="schema_name"></default>
+        <default applyOnUpdate="0" expression="" field="table_name"></default>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" constraints="0" field="id" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="1" constraints="3" field="schema_name" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="0" field="table_name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" exp_strength="0" field="id" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="3" exp_strength="0" field="schema_name" notnull_strength="1" unique_strength="1"></constraint>
+        <constraint constraints="0" exp_strength="0" field="table_name" notnull_strength="0" unique_strength="0"></constraint>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="schema_name" desc="" exp=""/>
-        <constraint field="table_name" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"></constraint>
+        <constraint desc="" exp="" field="schema_name"></constraint>
+        <constraint desc="" exp="" field="table_name"></constraint>
       </constraintExpressions>
-      <expressionfields/>
+      <expressionfields></expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"></defaultAction>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="schema_name" width="-1" hidden="0"/>
-          <column type="field" name="table_name" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" name="id" type="field" width="-1"></column>
+          <column hidden="0" name="schema_name" type="field" width="-1"></column>
+          <column hidden="0" name="table_name" type="field" width="-1"></column>
+          <column hidden="1" type="actions" width="-1"></column>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
+        <rowstyles></rowstyles>
+        <fieldstyles></fieldstyles>
       </conditionalstyles>
-      <storedexpressions/>
+      <storedexpressions></storedexpressions>
       <editform tolerant="1"></editform>
-      <editforminit/>
+      <editforminit></editforminit>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+      <editforminitcode># -*- coding: utf-8 -*-
 """
 QGIS forms can have a Python function that is called when the form is
 opened.
@@ -3072,29 +3299,30 @@ from qgis.PyQt.QtWidgets import QWidget
 def my_form_open(dialog, layer, feature):
 	geom = feature.geometry()
 	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
+</editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>tablayout</editorlayout>
       <attributeEditorForm>
-        <attributeEditorField name="schema_name" index="1" showLabel="1"/>
-        <attributeEditorField name="table_name" index="2" showLabel="1"/>
+        <attributeEditorField index="1" name="schema_name" showLabel="1"></attributeEditorField>
+        <attributeEditorField index="2" name="table_name" showLabel="1"></attributeEditorField>
       </attributeEditorForm>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="schema_name"/>
-        <field editable="1" name="table_name"/>
+        <field editable="1" name="id"></field>
+        <field editable="1" name="schema_name"></field>
+        <field editable="1" name="table_name"></field>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="schema_name" labelOnTop="0"/>
-        <field name="table_name" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"></field>
+        <field labelOnTop="0" name="schema_name"></field>
+        <field labelOnTop="0" name="table_name"></field>
       </labelOnTop>
-      <dataDefinedFieldProperties/>
-      <widgets/>
+      <reuseLastValue></reuseLastValue>
+      <dataDefinedFieldProperties></dataDefinedFieldProperties>
+      <widgets></widgets>
       <previewExpression>"schema_name" || '.' || "table_name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" readOnly="1" type="vector" refreshOnNotifyEnabled="0" geometry="No geometry" maxScale="0" autoRefreshTime="0" wkbType="NoGeometry" styleCategories="AllStyleCategories" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" geometry="No geometry" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" maxScale="0" minScale="1e+08" readOnly="1" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" type="vector" wkbType="NoGeometry">
       <id>v_orphan_tables_33b5eba9_96d1_442a_a32e_90a10c6fd2e5</id>
       <datasource>service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table="pgmetadata"."v_orphan_tables"</datasource>
       <keywordList>
@@ -3130,7 +3358,7 @@ def my_form_open(dialog, layer, feature):
           <email></email>
           <role></role>
         </contact>
-        <links/>
+        <links></links>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -3147,7 +3375,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxx="0" dimensions="2" crs="" miny="0" maxz="0" minz="0" minx="0" maxy="0"/>
+          <spatial crs="" dimensions="2" maxx="0" maxy="0" maxz="0" minx="0" miny="0" minz="0"></spatial>
           <temporal>
             <period>
               <start></start>
@@ -3157,114 +3385,118 @@ def my_form_open(dialog, layer, feature):
         </extent>
       </resourceMetadata>
       <provider encoding="">postgres</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
+      <vectorjoins></vectorjoins>
+      <layerDependencies></layerDependencies>
+      <dataDependencies></dataDependencies>
+      <expressionfields></expressionfields>
       <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+        <map-layer-style name="défaut"></map-layer-style>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
+      <auxiliaryLayer></auxiliaryLayer>
+      <metadataUrls></metadataUrls>
       <flags>
         <Identifiable>1</Identifiable>
         <Removable>1</Removable>
         <Searchable>1</Searchable>
+        <Private>0</Private>
       </flags>
-      <temporal endExpression="" startField="" startExpression="" enabled="0" fixedDuration="0" accumulate="0" durationUnit="min" mode="0" endField="" durationField="">
+      <temporal accumulate="0" durationField="" durationUnit="min" enabled="0" endExpression="" endField="" fixedDuration="0" limitMode="0" mode="0" startExpression="" startField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
       <customproperties>
-        <property key="dualview/previewExpressions">
-          <value>"schemaname" || '.' || "tablename"</value>
-          <value>"schemaname"</value>
-        </property>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
+        <Option type="Map">
+          <Option name="dualview/previewExpressions" type="StringList">
+            <Option type="QString" value="&quot;schemaname&quot; || '.' || &quot;tablename&quot;"></Option>
+            <Option type="QString" value="&quot;schemaname&quot;"></Option>
+          </Option>
+          <Option name="embeddedWidgets/count" type="QString" value="0"></Option>
+          <Option name="variableNames"></Option>
+          <Option name="variableValues"></Option>
+        </Option>
       </customproperties>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+        <activeChecks></activeChecks>
+        <checkConfiguration></checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector"/>
-      <referencedLayers/>
+      <legend showLabelLegend="0" type="default-vector"></legend>
+      <referencedLayers></referencedLayers>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="schemaname" configurationFlags="None">
+        <field configurationFlags="None" name="schemaname">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="tablename" configurationFlags="None">
+        <field configurationFlags="None" name="tablename">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="schemaname" name="Schema" index="1"/>
-        <alias field="tablename" name="Table" index="2"/>
+        <alias field="id" index="0" name=""></alias>
+        <alias field="schemaname" index="1" name="Schema"></alias>
+        <alias field="tablename" index="2" name="Table"></alias>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="schemaname" applyOnUpdate="0"/>
-        <default expression="" field="tablename" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"></default>
+        <default applyOnUpdate="0" expression="" field="schemaname"></default>
+        <default applyOnUpdate="0" expression="" field="tablename"></default>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" constraints="3" field="id" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="0" field="schemaname" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="tablename" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="3" exp_strength="0" field="id" notnull_strength="1" unique_strength="1"></constraint>
+        <constraint constraints="0" exp_strength="0" field="schemaname" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="tablename" notnull_strength="0" unique_strength="0"></constraint>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="schemaname" desc="" exp=""/>
-        <constraint field="tablename" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"></constraint>
+        <constraint desc="" exp="" field="schemaname"></constraint>
+        <constraint desc="" exp="" field="tablename"></constraint>
       </constraintExpressions>
-      <expressionfields/>
+      <expressionfields></expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"></defaultAction>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="schemaname" width="-1" hidden="0"/>
-          <column type="field" name="tablename" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" name="id" type="field" width="-1"></column>
+          <column hidden="0" name="schemaname" type="field" width="-1"></column>
+          <column hidden="0" name="tablename" type="field" width="-1"></column>
+          <column hidden="1" type="actions" width="-1"></column>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
+        <rowstyles></rowstyles>
+        <fieldstyles></fieldstyles>
       </conditionalstyles>
-      <storedexpressions/>
+      <storedexpressions></storedexpressions>
       <editform tolerant="1"></editform>
-      <editforminit/>
+      <editforminit></editforminit>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+      <editforminitcode># -*- coding: utf-8 -*-
 """
 QGIS forms can have a Python function that is called when the form is
 opened.
@@ -3280,29 +3512,30 @@ from qgis.PyQt.QtWidgets import QWidget
 def my_form_open(dialog, layer, feature):
 	geom = feature.geometry()
 	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
+</editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>tablayout</editorlayout>
       <attributeEditorForm>
-        <attributeEditorField name="schemaname" index="1" showLabel="1"/>
-        <attributeEditorField name="tablename" index="2" showLabel="1"/>
+        <attributeEditorField index="1" name="schemaname" showLabel="1"></attributeEditorField>
+        <attributeEditorField index="2" name="tablename" showLabel="1"></attributeEditorField>
       </attributeEditorForm>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="schemaname"/>
-        <field editable="1" name="tablename"/>
+        <field editable="1" name="id"></field>
+        <field editable="1" name="schemaname"></field>
+        <field editable="1" name="tablename"></field>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="schemaname" labelOnTop="0"/>
-        <field name="tablename" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"></field>
+        <field labelOnTop="0" name="schemaname"></field>
+        <field labelOnTop="0" name="tablename"></field>
       </labelOnTop>
-      <dataDefinedFieldProperties/>
-      <widgets/>
+      <reuseLastValue></reuseLastValue>
+      <dataDefinedFieldProperties></dataDefinedFieldProperties>
+      <widgets></widgets>
       <previewExpression>"schemaname" || '.' || "tablename"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" readOnly="1" type="vector" refreshOnNotifyEnabled="0" geometry="No geometry" maxScale="0" autoRefreshTime="0" wkbType="NoGeometry" styleCategories="AllStyleCategories" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" geometry="No geometry" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" maxScale="0" minScale="1e+08" readOnly="1" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" type="vector" wkbType="NoGeometry">
       <id>v_schema_list_140f3a29_ae94_480c_932c_fb47bdad292c</id>
       <datasource>service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table="pgmetadata"."v_schema_list"</datasource>
       <keywordList>
@@ -3338,7 +3571,7 @@ def my_form_open(dialog, layer, feature):
           <email></email>
           <role></role>
         </contact>
-        <links/>
+        <links></links>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -3355,7 +3588,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxx="0" dimensions="2" crs="" miny="0" maxz="0" minz="0" minx="0" maxy="0"/>
+          <spatial crs="" dimensions="2" maxx="0" maxy="0" maxz="0" minx="0" miny="0" minz="0"></spatial>
           <temporal>
             <period>
               <start></start>
@@ -3365,96 +3598,100 @@ def my_form_open(dialog, layer, feature):
         </extent>
       </resourceMetadata>
       <provider encoding="">postgres</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
+      <vectorjoins></vectorjoins>
+      <layerDependencies></layerDependencies>
+      <dataDependencies></dataDependencies>
+      <expressionfields></expressionfields>
       <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
+        <map-layer-style name="default"></map-layer-style>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
+      <auxiliaryLayer></auxiliaryLayer>
+      <metadataUrls></metadataUrls>
       <flags>
         <Identifiable>1</Identifiable>
         <Removable>1</Removable>
         <Searchable>1</Searchable>
+        <Private>0</Private>
       </flags>
-      <temporal endExpression="" startField="" startExpression="" enabled="0" fixedDuration="0" accumulate="0" durationUnit="min" mode="0" endField="" durationField="">
+      <temporal accumulate="0" durationField="" durationUnit="min" enabled="0" endExpression="" endField="" fixedDuration="0" limitMode="0" mode="0" startExpression="" startField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
       <customproperties>
-        <property value="&quot;schema_name&quot;" key="dualview/previewExpressions"/>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
+        <Option type="Map">
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;schema_name&quot;"></Option>
+          <Option name="embeddedWidgets/count" type="QString" value="0"></Option>
+          <Option name="variableNames"></Option>
+          <Option name="variableValues"></Option>
+        </Option>
       </customproperties>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+        <activeChecks></activeChecks>
+        <checkConfiguration></checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector"/>
-      <referencedLayers/>
+      <legend showLabelLegend="0" type="default-vector"></legend>
+      <referencedLayers></referencedLayers>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="schema_name" configurationFlags="None">
+        <field configurationFlags="None" name="schema_name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="schema_name" name="Schema" index="1"/>
+        <alias field="id" index="0" name=""></alias>
+        <alias field="schema_name" index="1" name="Schema"></alias>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="schema_name" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"></default>
+        <default applyOnUpdate="0" expression="" field="schema_name"></default>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" constraints="3" field="id" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="0" field="schema_name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="3" exp_strength="0" field="id" notnull_strength="1" unique_strength="1"></constraint>
+        <constraint constraints="0" exp_strength="0" field="schema_name" notnull_strength="0" unique_strength="0"></constraint>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="schema_name" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"></constraint>
+        <constraint desc="" exp="" field="schema_name"></constraint>
       </constraintExpressions>
-      <expressionfields/>
+      <expressionfields></expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"></defaultAction>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;schema_name&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;schema_name&quot;" sortOrder="0">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="schema_name" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" name="id" type="field" width="-1"></column>
+          <column hidden="0" name="schema_name" type="field" width="-1"></column>
+          <column hidden="1" type="actions" width="-1"></column>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
+        <rowstyles></rowstyles>
+        <fieldstyles></fieldstyles>
       </conditionalstyles>
-      <storedexpressions/>
+      <storedexpressions></storedexpressions>
       <editform tolerant="1"></editform>
-      <editforminit/>
+      <editforminit></editforminit>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+      <editforminitcode># -*- coding: utf-8 -*-
 """
 QGIS forms can have a Python function that is called when the form is
 opened.
@@ -3470,26 +3707,27 @@ from qgis.PyQt.QtWidgets import QWidget
 def my_form_open(dialog, layer, feature):
 	geom = feature.geometry()
 	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
+</editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>tablayout</editorlayout>
       <attributeEditorForm>
-        <attributeEditorField name="schema_name" index="1" showLabel="1"/>
+        <attributeEditorField index="1" name="schema_name" showLabel="1"></attributeEditorField>
       </attributeEditorForm>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="1" name="schema_name"/>
+        <field editable="1" name="id"></field>
+        <field editable="1" name="schema_name"></field>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="schema_name" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"></field>
+        <field labelOnTop="0" name="schema_name"></field>
       </labelOnTop>
-      <dataDefinedFieldProperties/>
-      <widgets/>
+      <reuseLastValue></reuseLastValue>
+      <dataDefinedFieldProperties></dataDefinedFieldProperties>
+      <widgets></widgets>
       <previewExpression>"schema_name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" readOnly="0" type="vector" refreshOnNotifyEnabled="0" geometry="No geometry" maxScale="0" autoRefreshTime="0" wkbType="NoGeometry" styleCategories="AllStyleCategories" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" geometry="No geometry" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" maxScale="0" minScale="1e+08" readOnly="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" type="vector" wkbType="NoGeometry">
       <id>v_table_comment_from_metadata_d6be195f_86d0_4ef6_af4d_d1fef8a4b7f7</id>
       <datasource>service='pgmetadata' sslmode=disable key='table_schema' estimatedmetadata=true checkPrimaryKeyUnicity='1' table="pgmetadata"."v_table_comment_from_metadata"</datasource>
       <keywordList>
@@ -3516,7 +3754,7 @@ def my_form_open(dialog, layer, feature):
         <type>dataset</type>
         <title></title>
         <abstract>View containing the desired formatted comment for the tables listed in the pgmetadata.dataset table. This view is used by the trigger to update the table comment when the dataset item is added or modified</abstract>
-        <links/>
+        <links></links>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -3532,129 +3770,134 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent></extent>
       </resourceMetadata>
       <provider encoding="">postgres</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
+      <vectorjoins></vectorjoins>
+      <layerDependencies></layerDependencies>
+      <dataDependencies></dataDependencies>
+      <expressionfields></expressionfields>
       <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+        <map-layer-style name="défaut"></map-layer-style>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
+      <auxiliaryLayer></auxiliaryLayer>
+      <metadataUrls></metadataUrls>
       <flags>
         <Identifiable>1</Identifiable>
         <Removable>1</Removable>
         <Searchable>1</Searchable>
+        <Private>0</Private>
       </flags>
-      <temporal endExpression="" startField="" startExpression="" enabled="0" fixedDuration="0" accumulate="0" durationUnit="min" mode="0" endField="" durationField="">
+      <temporal accumulate="0" durationField="" durationUnit="min" enabled="0" endExpression="" endField="" fixedDuration="0" limitMode="0" mode="0" startExpression="" startField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <customproperties/>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <customproperties>
+        <Option></Option>
+      </customproperties>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
-          <Option type="QString" value=""/>
+          <Option type="QString" value=""></Option>
         </activeChecks>
-        <checkConfiguration/>
+        <checkConfiguration></checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector"/>
-      <referencedLayers/>
+      <legend showLabelLegend="0" type="default-vector"></legend>
+      <referencedLayers></referencedLayers>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="table_schema" configurationFlags="None">
+        <field configurationFlags="None" name="table_schema">
           <editWidget type="">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="table_name" configurationFlags="None">
+        <field configurationFlags="None" name="table_name">
           <editWidget type="">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="table_comment" configurationFlags="None">
+        <field configurationFlags="None" name="table_comment">
           <editWidget type="">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="table_type" configurationFlags="None">
+        <field configurationFlags="None" name="table_type">
           <editWidget type="">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="table_schema" name="" index="1"/>
-        <alias field="table_name" name="" index="2"/>
-        <alias field="table_comment" name="" index="3"/>
-        <alias field="table_type" name="" index="4"/>
+        <alias field="id" index="0" name=""></alias>
+        <alias field="table_schema" index="1" name=""></alias>
+        <alias field="table_name" index="2" name=""></alias>
+        <alias field="table_comment" index="3" name=""></alias>
+        <alias field="table_type" index="4" name=""></alias>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="table_schema" applyOnUpdate="0"/>
-        <default expression="" field="table_name" applyOnUpdate="0"/>
-        <default expression="" field="table_comment" applyOnUpdate="0"/>
-        <default expression="" field="table_type" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"></default>
+        <default applyOnUpdate="0" expression="" field="table_schema"></default>
+        <default applyOnUpdate="0" expression="" field="table_name"></default>
+        <default applyOnUpdate="0" expression="" field="table_comment"></default>
+        <default applyOnUpdate="0" expression="" field="table_type"></default>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" constraints="0" field="id" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="1" constraints="3" field="table_schema" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="0" field="table_name" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="table_comment" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="table_type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" exp_strength="0" field="id" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="3" exp_strength="0" field="table_schema" notnull_strength="1" unique_strength="1"></constraint>
+        <constraint constraints="0" exp_strength="0" field="table_name" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="table_comment" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="table_type" notnull_strength="0" unique_strength="0"></constraint>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="table_schema" desc="" exp=""/>
-        <constraint field="table_name" desc="" exp=""/>
-        <constraint field="table_comment" desc="" exp=""/>
-        <constraint field="table_type" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"></constraint>
+        <constraint desc="" exp="" field="table_schema"></constraint>
+        <constraint desc="" exp="" field="table_name"></constraint>
+        <constraint desc="" exp="" field="table_comment"></constraint>
+        <constraint desc="" exp="" field="table_type"></constraint>
       </constraintExpressions>
-      <expressionfields/>
+      <expressionfields></expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"></defaultAction>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
-        <columns/>
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+        <columns></columns>
       </attributetableconfig>
       <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
+        <rowstyles></rowstyles>
+        <fieldstyles></fieldstyles>
       </conditionalstyles>
-      <storedexpressions/>
+      <storedexpressions></storedexpressions>
       <editform tolerant="1"></editform>
-      <editforminit/>
+      <editforminit></editforminit>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode></editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
-      <editable/>
-      <labelOnTop/>
-      <dataDefinedFieldProperties/>
-      <widgets/>
+      <editable></editable>
+      <labelOnTop></labelOnTop>
+      <reuseLastValue></reuseLastValue>
+      <dataDefinedFieldProperties></dataDefinedFieldProperties>
+      <widgets></widgets>
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" readOnly="1" type="vector" refreshOnNotifyEnabled="0" geometry="No geometry" maxScale="0" autoRefreshTime="0" wkbType="NoGeometry" styleCategories="AllStyleCategories" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" geometry="No geometry" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" maxScale="0" minScale="1e+08" readOnly="1" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" type="vector" wkbType="NoGeometry">
       <id>v_table_list_48c78797_5376_47b8_90e0_8c4f8236fa44</id>
       <datasource>service='pgmetadata' sslmode=disable key='id' estimatedmetadata=true checkPrimaryKeyUnicity='1' table="pgmetadata"."v_table_list"</datasource>
       <keywordList>
@@ -3690,7 +3933,7 @@ def my_form_open(dialog, layer, feature):
           <email></email>
           <role></role>
         </contact>
-        <links/>
+        <links></links>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -3707,7 +3950,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxx="0" dimensions="2" crs="" miny="0" maxz="0" minz="0" minx="0" maxy="0"/>
+          <spatial crs="" dimensions="2" maxx="0" maxy="0" maxz="0" minx="0" miny="0" minz="0"></spatial>
           <temporal>
             <period>
               <start></start>
@@ -3717,115 +3960,119 @@ def my_form_open(dialog, layer, feature):
         </extent>
       </resourceMetadata>
       <provider encoding="">postgres</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
+      <vectorjoins></vectorjoins>
+      <layerDependencies></layerDependencies>
+      <dataDependencies></dataDependencies>
+      <expressionfields></expressionfields>
       <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
+        <map-layer-style name="default"></map-layer-style>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
+      <auxiliaryLayer></auxiliaryLayer>
+      <metadataUrls></metadataUrls>
       <flags>
         <Identifiable>1</Identifiable>
         <Removable>1</Removable>
         <Searchable>1</Searchable>
+        <Private>0</Private>
       </flags>
-      <temporal endExpression="" startField="" startExpression="" enabled="0" fixedDuration="0" accumulate="0" durationUnit="min" mode="0" endField="" durationField="">
+      <temporal accumulate="0" durationField="" durationUnit="min" enabled="0" endExpression="" endField="" fixedDuration="0" limitMode="0" mode="0" startExpression="" startField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
       <customproperties>
-        <property key="dualview/previewExpressions">
-          <value> "schema_name" || '.' ||  "table_name" </value>
-          <value>"schema_name"</value>
-          <value> "schema_name" || '.' ||  "table_name" </value>
-        </property>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
+        <Option type="Map">
+          <Option name="dualview/previewExpressions" type="StringList">
+            <Option type="QString" value=" &quot;schema_name&quot; || '.' ||  &quot;table_name&quot; "></Option>
+            <Option type="QString" value="&quot;schema_name&quot;"></Option>
+            <Option type="QString" value=" &quot;schema_name&quot; || '.' ||  &quot;table_name&quot; "></Option>
+          </Option>
+          <Option name="embeddedWidgets/count" type="QString" value="0"></Option>
+          <Option name="variableNames"></Option>
+          <Option name="variableValues"></Option>
+        </Option>
       </customproperties>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+        <activeChecks></activeChecks>
+        <checkConfiguration></checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector"/>
-      <referencedLayers/>
+      <legend showLabelLegend="0" type="default-vector"></legend>
+      <referencedLayers></referencedLayers>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="schema_name" configurationFlags="None">
+        <field configurationFlags="None" name="schema_name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="table_name" configurationFlags="None">
+        <field configurationFlags="None" name="table_name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" value="false" name="IsMultiline"/>
-                <Option type="bool" value="false" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"></Option>
+                <Option name="UseHtml" type="bool" value="false"></Option>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="schema_name" name="Schema" index="1"/>
-        <alias field="table_name" name="Table" index="2"/>
+        <alias field="id" index="0" name=""></alias>
+        <alias field="schema_name" index="1" name="Schema"></alias>
+        <alias field="table_name" index="2" name="Table"></alias>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="schema_name" applyOnUpdate="0"/>
-        <default expression="" field="table_name" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"></default>
+        <default applyOnUpdate="0" expression="" field="schema_name"></default>
+        <default applyOnUpdate="0" expression="" field="table_name"></default>
       </defaults>
       <constraints>
-        <constraint unique_strength="1" constraints="3" field="id" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="0" field="schema_name" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="0" constraints="0" field="table_name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="3" exp_strength="0" field="id" notnull_strength="1" unique_strength="1"></constraint>
+        <constraint constraints="0" exp_strength="0" field="schema_name" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="0" exp_strength="0" field="table_name" notnull_strength="0" unique_strength="0"></constraint>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="schema_name" desc="" exp=""/>
-        <constraint field="table_name" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"></constraint>
+        <constraint desc="" exp="" field="schema_name"></constraint>
+        <constraint desc="" exp="" field="table_name"></constraint>
       </constraintExpressions>
-      <expressionfields/>
+      <expressionfields></expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"></defaultAction>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;schema_name&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;schema_name&quot;" sortOrder="0">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="schema_name" width="-1" hidden="0"/>
-          <column type="field" name="table_name" width="254" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" name="id" type="field" width="-1"></column>
+          <column hidden="0" name="schema_name" type="field" width="-1"></column>
+          <column hidden="0" name="table_name" type="field" width="254"></column>
+          <column hidden="1" type="actions" width="-1"></column>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
+        <rowstyles></rowstyles>
+        <fieldstyles></fieldstyles>
       </conditionalstyles>
-      <storedexpressions/>
+      <storedexpressions></storedexpressions>
       <editform tolerant="1"></editform>
-      <editforminit/>
+      <editforminit></editforminit>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+      <editforminitcode># -*- coding: utf-8 -*-
 """
 QGIS forms can have a Python function that is called when the form is
 opened.
@@ -3841,29 +4088,30 @@ from qgis.PyQt.QtWidgets import QWidget
 def my_form_open(dialog, layer, feature):
 	geom = feature.geometry()
 	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
+</editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>tablayout</editorlayout>
       <attributeEditorForm>
-        <attributeEditorField name="schema_name" index="1" showLabel="1"/>
-        <attributeEditorField name="table_name" index="2" showLabel="1"/>
+        <attributeEditorField index="1" name="schema_name" showLabel="1"></attributeEditorField>
+        <attributeEditorField index="2" name="table_name" showLabel="1"></attributeEditorField>
       </attributeEditorForm>
       <editable>
-        <field editable="1" name="id"/>
-        <field editable="0" name="schema_name"/>
-        <field editable="0" name="table_name"/>
+        <field editable="1" name="id"></field>
+        <field editable="0" name="schema_name"></field>
+        <field editable="0" name="table_name"></field>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="schema_name" labelOnTop="0"/>
-        <field name="table_name" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"></field>
+        <field labelOnTop="0" name="schema_name"></field>
+        <field labelOnTop="0" name="table_name"></field>
       </labelOnTop>
-      <dataDefinedFieldProperties/>
-      <widgets/>
+      <reuseLastValue></reuseLastValue>
+      <dataDefinedFieldProperties></dataDefinedFieldProperties>
+      <widgets></widgets>
       <previewExpression> "schema_name" || '.' ||  "table_name" </previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer refreshOnNotifyMessage="" readOnly="0" type="vector" refreshOnNotifyEnabled="0" geometry="No geometry" maxScale="0" autoRefreshTime="0" wkbType="NoGeometry" styleCategories="AllStyleCategories" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" geometry="No geometry" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" maxScale="0" minScale="1e+08" readOnly="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" type="vector" wkbType="NoGeometry">
       <id>v_valid_dataset_4e46ef23_a5aa_441f_b21a_92bb573cbdfd</id>
       <datasource>service='pgmetadata' sslmode=disable key='schema_name' estimatedmetadata=true checkPrimaryKeyUnicity='1' table="pgmetadata"."v_valid_dataset"</datasource>
       <keywordList>
@@ -3890,7 +4138,7 @@ def my_form_open(dialog, layer, feature):
         <type>dataset</type>
         <title></title>
         <abstract></abstract>
-        <links/>
+        <links></links>
         <fees></fees>
         <encoding></encoding>
         <crs>
@@ -3906,109 +4154,114 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent></extent>
       </resourceMetadata>
       <provider encoding="">postgres</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
+      <vectorjoins></vectorjoins>
+      <layerDependencies></layerDependencies>
+      <dataDependencies></dataDependencies>
+      <expressionfields></expressionfields>
       <map-layer-style-manager current="défaut">
-        <map-layer-style name="défaut"/>
+        <map-layer-style name="défaut"></map-layer-style>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
+      <auxiliaryLayer></auxiliaryLayer>
+      <metadataUrls></metadataUrls>
       <flags>
         <Identifiable>1</Identifiable>
         <Removable>1</Removable>
         <Searchable>1</Searchable>
+        <Private>0</Private>
       </flags>
-      <temporal endExpression="" startField="" startExpression="" enabled="0" fixedDuration="0" accumulate="0" durationUnit="min" mode="0" endField="" durationField="">
+      <temporal accumulate="0" durationField="" durationUnit="min" enabled="0" endExpression="" endField="" fixedDuration="0" limitMode="0" mode="0" startExpression="" startField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <customproperties/>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <customproperties>
+        <Option></Option>
+      </customproperties>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
-          <Option type="QString" value=""/>
+          <Option type="QString" value=""></Option>
         </activeChecks>
-        <checkConfiguration/>
+        <checkConfiguration></checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector"/>
-      <referencedLayers/>
+      <legend showLabelLegend="0" type="default-vector"></legend>
+      <referencedLayers></referencedLayers>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="schema_name" configurationFlags="None">
+        <field configurationFlags="None" name="schema_name">
           <editWidget type="">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
-        <field name="table_name" configurationFlags="None">
+        <field configurationFlags="None" name="table_name">
           <editWidget type="">
             <config>
-              <Option/>
+              <Option></Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="schema_name" name="" index="1"/>
-        <alias field="table_name" name="" index="2"/>
+        <alias field="id" index="0" name=""></alias>
+        <alias field="schema_name" index="1" name=""></alias>
+        <alias field="table_name" index="2" name=""></alias>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="schema_name" applyOnUpdate="0"/>
-        <default expression="" field="table_name" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"></default>
+        <default applyOnUpdate="0" expression="" field="schema_name"></default>
+        <default applyOnUpdate="0" expression="" field="table_name"></default>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" constraints="0" field="id" exp_strength="0" notnull_strength="0"/>
-        <constraint unique_strength="1" constraints="3" field="schema_name" exp_strength="0" notnull_strength="1"/>
-        <constraint unique_strength="0" constraints="0" field="table_name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" exp_strength="0" field="id" notnull_strength="0" unique_strength="0"></constraint>
+        <constraint constraints="3" exp_strength="0" field="schema_name" notnull_strength="1" unique_strength="1"></constraint>
+        <constraint constraints="0" exp_strength="0" field="table_name" notnull_strength="0" unique_strength="0"></constraint>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="schema_name" desc="" exp=""/>
-        <constraint field="table_name" desc="" exp=""/>
+        <constraint desc="" exp="" field="id"></constraint>
+        <constraint desc="" exp="" field="schema_name"></constraint>
+        <constraint desc="" exp="" field="table_name"></constraint>
       </constraintExpressions>
-      <expressionfields/>
+      <expressionfields></expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"></defaultAction>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
-        <columns/>
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+        <columns></columns>
       </attributetableconfig>
       <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
+        <rowstyles></rowstyles>
+        <fieldstyles></fieldstyles>
       </conditionalstyles>
-      <storedexpressions/>
+      <storedexpressions></storedexpressions>
       <editform tolerant="1"></editform>
-      <editforminit/>
+      <editforminit></editforminit>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath></editforminitfilepath>
-      <editforminitcode><![CDATA[]]></editforminitcode>
+      <editforminitcode></editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
-      <editable/>
-      <labelOnTop/>
-      <dataDefinedFieldProperties/>
-      <widgets/>
+      <editable></editable>
+      <labelOnTop></labelOnTop>
+      <reuseLastValue></reuseLastValue>
+      <dataDefinedFieldProperties></dataDefinedFieldProperties>
+      <widgets></widgets>
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
   </projectlayers>
   <layerorder>
-    <layer id="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd"/>
+    <layer id="dataset_00c9da4d_d717_48cc_a848_0d4544b019fd"></layer>
   </layerorder>
   <properties>
     <DefaultStyles>
@@ -4071,13 +4324,13 @@ def my_form_open(dialog, layer, feature):
     <SpatialRefSys>
       <ProjectionsEnabled type="int">1</ProjectionsEnabled>
     </SpatialRefSys>
-    <WCSLayers type="QStringList"/>
+    <WCSLayers type="QStringList"></WCSLayers>
     <WCSUrl type="QString"></WCSUrl>
-    <WFSLayers type="QStringList"/>
+    <WFSLayers type="QStringList"></WFSLayers>
     <WFSTLayers>
-      <Delete type="QStringList"/>
-      <Insert type="QStringList"/>
-      <Update type="QStringList"/>
+      <Delete type="QStringList"></Delete>
+      <Insert type="QStringList"></Insert>
+      <Update type="QStringList"></Update>
     </WFSTLayers>
     <WFSUrl type="QString"></WFSUrl>
     <WMSAccessConstraints type="QString">None</WMSAccessConstraints>
@@ -4105,36 +4358,36 @@ def my_form_open(dialog, layer, feature):
     <WMSUrl type="QString"></WMSUrl>
     <WMSUseLayerIDs type="bool">false</WMSUseLayerIDs>
     <WMTSGrids>
-      <CRS type="QStringList"/>
-      <Config type="QStringList"/>
+      <CRS type="QStringList"></CRS>
+      <Config type="QStringList"></Config>
     </WMTSGrids>
     <WMTSJpegLayers>
-      <Group type="QStringList"/>
-      <Layer type="QStringList"/>
+      <Group type="QStringList"></Group>
+      <Layer type="QStringList"></Layer>
       <Project type="bool">false</Project>
     </WMTSJpegLayers>
     <WMTSLayers>
-      <Group type="QStringList"/>
-      <Layer type="QStringList"/>
+      <Group type="QStringList"></Group>
+      <Layer type="QStringList"></Layer>
       <Project type="bool">false</Project>
     </WMTSLayers>
     <WMTSMinScale type="int">5000</WMTSMinScale>
     <WMTSPngLayers>
-      <Group type="QStringList"/>
-      <Layer type="QStringList"/>
+      <Group type="QStringList"></Group>
+      <Layer type="QStringList"></Layer>
       <Project type="bool">false</Project>
     </WMTSPngLayers>
     <WMTSUrl type="QString"></WMTSUrl>
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option type="QString" value="" name="name"/>
-      <Option name="properties"/>
-      <Option type="QString" value="collection" name="type"/>
+      <Option name="name" type="QString" value=""></Option>
+      <Option name="properties"></Option>
+      <Option name="type" type="QString" value="collection"></Option>
     </Option>
   </dataDefinedServerProperties>
-  <visibility-presets/>
-  <transformContext/>
+  <visibility-presets></visibility-presets>
+  <transformContext></transformContext>
   <projectMetadata>
     <identifier></identifier>
     <parentidentifier></parentidentifier>
@@ -4151,18 +4404,18 @@ def my_form_open(dialog, layer, feature):
       <email></email>
       <role></role>
     </contact>
-    <links/>
+    <links></links>
     <author>mdouchin</author>
     <creation>2020-10-07T17:29:03</creation>
   </projectMetadata>
-  <Annotations/>
-  <Layouts/>
-  <Bookmarks/>
-  <ProjectViewSettings UseProjectScales="0">
-    <Scales/>
-    <DefaultViewExtent ymin="47.60355942459566592" ymax="48.84992135993788764" xmin="4.18868096007928425" xmax="7.91410800517069202">
+  <Annotations></Annotations>
+  <Layouts></Layouts>
+  <Bookmarks></Bookmarks>
+  <ProjectViewSettings UseProjectScales="0" rotation="0">
+    <Scales></Scales>
+    <DefaultViewExtent xmax="7.05871444374667956" xmin="5.04407452150329672" ymax="49.10570143851136038" ymin="47.34777934602219318">
       <spatialrefsys>
-        <wkt>GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+        <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
         <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
         <srsid>3452</srsid>
         <srid>4326</srid>
@@ -4174,19 +4427,19 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectTimeSettings timeStepUnit="h" timeStep="1" frameRate="1" cumulativeTemporalRange="0"/>
+  <ProjectTimeSettings cumulativeTemporalRange="0" frameRate="1" timeStep="1" timeStepUnit="h"></ProjectTimeSettings>
   <ProjectDisplaySettings>
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option type="QChar" value="" name="decimal_separator"/>
-        <Option type="int" value="6" name="decimals"/>
-        <Option type="int" value="0" name="direction_format"/>
-        <Option type="int" value="0" name="rounding_type"/>
-        <Option type="bool" value="false" name="show_plus"/>
-        <Option type="bool" value="true" name="show_thousand_separator"/>
-        <Option type="bool" value="false" name="show_trailing_zeros"/>
-        <Option type="QChar" value="" name="thousand_separator"/>
+        <Option name="decimal_separator" type="QChar" value=""></Option>
+        <Option name="decimals" type="int" value="6"></Option>
+        <Option name="direction_format" type="int" value="0"></Option>
+        <Option name="rounding_type" type="int" value="0"></Option>
+        <Option name="show_plus" type="bool" value="false"></Option>
+        <Option name="show_thousand_separator" type="bool" value="true"></Option>
+        <Option name="show_trailing_zeros" type="bool" value="false"></Option>
+        <Option name="thousand_separator" type="QChar" value=""></Option>
       </Option>
     </BearingFormat>
   </ProjectDisplaySettings>
-</qgis>
+</qgis>
\ No newline at end of file
diff --git a/pg_metadata/test/test_sql.py b/pg_metadata/test/test_sql.py
index 1a5077cd..07e7ac89 100644
--- a/pg_metadata/test/test_sql.py
+++ b/pg_metadata/test/test_sql.py
@@ -374,7 +374,7 @@ def test_trigger_calculate_fields(self):
         self.assertEqual('LINESTRING', result[1])
         self.assertEqual('EPSG:4326', result[2])
         coordinates = [f.strip()[0:6] for f in result[3].split(',')]
-        self.assertListEqual(['3.8540', '3.8969', '43.578', '43.621'], coordinates)
+        self.assertListEqual(['3.854', '3.897', '43.578', '43.622'], coordinates)
 
         # Test date, creation_date is not equal to update_date
         sql = "SELECT creation_date, update_date FROM pgmetadata.dataset"